Package rename for usergrid/stack with 100% tests passing.

.gitignore

@@ -18,3 +18,4 @@ Icon
 /portal/dist
 /portal/bower_components
 /portal/.idea
+/stack/corepersistence/priamcluster/aws.properties

stack/build-tools/pom.xml

@@ -4,9 +4,9 @@
          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.usergrid</groupId>
+    <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.28-SNAPSHOT</version>
+    <version>0.0.29-SNAPSHOT</version>
   </parent>
 
   <artifactId>build-tools</artifactId>

stack/build-tools/src/main/resources/usergrid/checkstyle.xml

@@ -137,7 +137,7 @@
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->
     <module name="ImportOrder">
       <property name="option" value="bottom"/>
-      <property name="groups" value="java,javax,org.apache,org.apache.usergrid,com,org.usergrid,org,net"/>
+      <property name="groups" value="java,javax,org.apache,org.apache.usergrid,com,org.apache.usergrid,org,net"/>
       <property name="separated" value="true"/>
     </module>
     <!-- ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... -->

stack/config/pom.xml

@@ -3,9 +3,9 @@
          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.usergrid</groupId>
+    <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.28-SNAPSHOT</version>
+    <version>0.0.29-SNAPSHOT</version>
   </parent>
 
   <artifactId>usergrid-config</artifactId>

stack/config/src/main/resources/log4j.xml

@@ -23,31 +23,31 @@
         <level value="error"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.persistence.cassandra.BATCH">
+    <logger name="org.apache.usergrid.persistence.cassandra.BATCH">
         <level value="warn"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.persistence.cassandra.ConnectionRefImpl">
+    <logger name="org.apache.usergrid.persistence.cassandra.ConnectionRefImpl">
         <level value="warn"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.persistence.cassandra.DaoUtils">
+    <logger name="org.apache.usergrid.persistence.cassandra.DaoUtils">
         <level value="warn"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.persistence.cassandra.DB">
+    <logger name="org.apache.usergrid.persistence.cassandra.DB">
         <level value="warn"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.persistence.cassandra.EntityManagerFactoryImpl">
+    <logger name="org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl">
         <level value="warn"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.persistence.cassandra.EntityManagerImpl">
+    <logger name="org.apache.usergrid.persistence.cassandra.EntityManagerImpl">
         <level value="warn"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.rest.security.AllowAjaxFilter">
+    <logger name="org.apache.usergrid.rest.security.AllowAjaxFilter">
         <level value="warn"/>
         <appender-ref ref="stdout"/>
     </logger>

stack/config/src/main/resources/usergrid-default.properties

@@ -58,7 +58,7 @@ usergrid.version.properties=1.0.0
 # build number for display
 usergrid.version.build=${version}
 
-usergird.service.packages=com.usergrid.services;org.usergrid.services;baas.io
+usergird.service.packages=com.usergrid.services;org.apache.usergrid.services;baas.io
 
 #Batch submit counters ever 1000 updates
 usergrid.counter.batch.size=1000

stack/config/src/test/resources/log4j.properties

@@ -28,14 +28,14 @@ log4j.appender.stdout.layout.ConversionPattern=%d %p (%t) [%c] - %m%n
 
 log4j.category.org.apache=ERROR, stdout
 
-log4j.logger.org.usergrid.persistence.cassandra.DB=WARN, stdout
-log4j.logger.org.usergrid.persistence.cassandra.BATCH=WARN, stdout
-log4j.logger.org.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
-log4j.logger.org.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
-log4j.logger.org.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
-log4j.logger.org.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.DB=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.BATCH=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerFactoryImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.DaoUtils=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.EntityManagerImpl=WARN, stdout
+log4j.logger.org.apache.usergrid.persistence.cassandra.ConnectionRefImpl=WARN, stdout
 log4j.logger.me.prettyprint.cassandra.hector.TimingLogger=WARN, stdout
-log4j.logger.org.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
+log4j.logger.org.apache.usergrid.rest.security.AllowAjaxFilter=WARN, stdout
 log4j.logger.me.prettyprint.hector.api.beans.AbstractComposite=ERROR, stdout
 
 

stack/config/src/test/resources/log4j.xml

@@ -10,10 +10,10 @@
         <level value="error"/>
         <appender-ref ref="stdout"/>
     </logger>
-    <logger name="org.usergrid.persistence.cassandra.CounterUtils">
+    <logger name="org.apache.usergrid.persistence.cassandra.CounterUtils">
         <level value="warn"/>
     </logger>
-     <logger name="org.usergrid.mq.cassandra.io" additivity="false">
+     <logger name="org.apache.usergrid.mq.cassandra.io" additivity="false">
         <level value="DEBUG"/>
         <appender-ref ref="stdout"/>
     </logger>

stack/core/pom.xml

@@ -3,9 +3,9 @@
          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.usergrid</groupId>
+    <groupId>org.apache.usergrid</groupId>
     <artifactId>usergrid</artifactId>
-    <version>0.0.28-SNAPSHOT</version>
+    <version>0.0.29-SNAPSHOT</version>
   </parent>
 
   <properties>
@@ -102,7 +102,7 @@
                 <exclude>**/StringLiteralTest.java</exclude>
 
                 <!-- excludes all the iterator query integration tests -->
-                <exclude>**/org/usergrid/persistence/query/*IT.java</exclude>
+                <exclude>**/org/apache/usergrid/persistence/query/*IT.java</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -180,7 +180,7 @@
                 <exclude>**/StringLiteralTest.java</exclude>
 
                 <!-- excludes all the iterator query integration tests -->
-                <exclude>**/org/usergrid/persistence/query/*IT.java</exclude>
+                <exclude>**/org/apache/usergrid/persistence/query/*IT.java</exclude>
               </excludes>
             </configuration>
           </plugin>
@@ -268,7 +268,7 @@
             </goals>
             <configuration>
               <includes>
-                <include>**/org/usergrid/**</include>
+                <include>**/org/apache/usergrid/**</include>
               </includes>
             </configuration>
           </execution>
@@ -512,7 +512,7 @@
     <!-- Test and Logging Dependencies -->
 
     <dependency>
-      <groupId>org.usergrid</groupId>
+      <groupId>org.apache.usergrid</groupId>
       <artifactId>usergrid-config</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
@@ -532,7 +532,7 @@
     </dependency>
 
     <dependency>
-      <groupId>org.usergrid</groupId>
+      <groupId>org.apache.usergrid</groupId>
       <artifactId>usergrid-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>

stack/core/src/main/antlr3/org/usergrid/persistence/query/tree/QueryFilter.g → stack/core/src/main/antlr3/org/apache/usergrid/persistence/query/tree/QueryFilter.g

@@ -10,12 +10,12 @@ options {
 
 
 @header {
-package org.usergrid.persistence.query.tree;
+package org.apache.usergrid.persistence.query.tree;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.Query;
-import org.usergrid.persistence.Query.SortPredicate;
+import org.apache.usergrid.persistence.Query;
+import org.apache.usergrid.persistence.Query.SortPredicate;
 
 }
 
@@ -34,12 +34,12 @@ import org.usergrid.persistence.Query.SortPredicate;
 
 
 @lexer::header {
-package org.usergrid.persistence.query.tree;
+package org.apache.usergrid.persistence.query.tree;
 
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.usergrid.persistence.exceptions.QueryTokenException;
+import org.apache.usergrid.persistence.exceptions.QueryTokenException;
 
 }
 

stack/core/src/main/java/org/usergrid/batch/AppArgs.java → stack/core/src/main/java/org/apache/usergrid/batch/AppArgs.java

@@ -1,4 +1,4 @@
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 import com.beust.jcommander.JCommander;

stack/core/src/main/java/org/usergrid/batch/Job.java → stack/core/src/main/java/org/apache/usergrid/batch/Job.java

@@ -1,4 +1,4 @@
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 /**

stack/core/src/main/java/org/usergrid/batch/JobExecution.java → stack/core/src/main/java/org/apache/usergrid/batch/JobExecution.java

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 import java.util.UUID;
 
-import org.usergrid.persistence.entities.JobData;
-import org.usergrid.persistence.entities.JobStat;
+import org.apache.usergrid.persistence.entities.JobData;
+import org.apache.usergrid.persistence.entities.JobStat;
 
 
 /**

stack/core/src/main/java/org/usergrid/batch/JobExecutionImpl.java → stack/core/src/main/java/org/apache/usergrid/batch/JobExecutionImpl.java

@@ -1,12 +1,12 @@
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 import java.util.UUID;
 
-import org.usergrid.batch.repository.JobDescriptor;
-import org.usergrid.batch.service.JobRuntimeService;
-import org.usergrid.persistence.entities.JobData;
-import org.usergrid.persistence.entities.JobStat;
+import org.apache.usergrid.batch.repository.JobDescriptor;
+import org.apache.usergrid.batch.service.JobRuntimeService;
+import org.apache.usergrid.persistence.entities.JobData;
+import org.apache.usergrid.persistence.entities.JobStat;
 
 import com.google.common.base.Preconditions;
 
@@ -73,7 +73,7 @@ public JobData getJobData() {
     /*
      * (non-Javadoc)
      *
-     * @see org.usergrid.batch.JobExecution#getJobStats()
+     * @see org.apache.usergrid.batch.JobExecution#getJobStats()
      */
     @Override
     public JobStat getJobStats() {
@@ -124,7 +124,7 @@ public void killed() {
     /*
      * (non-Javadoc)
      *
-     * @see org.usergrid.batch.JobExecution#delay(long)
+     * @see org.apache.usergrid.batch.JobExecution#delay(long)
      */
     @Override
     public void delay( long delay ) {
@@ -152,7 +152,7 @@ public void heartbeat() {
 
 
     /* (non-Javadoc)
-     * @see org.usergrid.batch.JobExecution#heartbeat(long)
+     * @see org.apache.usergrid.batch.JobExecution#heartbeat(long)
      */
     @Override
     public void heartbeat( long milliseconds ) {
@@ -193,7 +193,7 @@ public String getJobName() {
 
 
     /* (non-Javadoc)
-     * @see org.usergrid.batch.JobRuntime#getExecution()
+     * @see org.apache.usergrid.batch.JobRuntime#getExecution()
      */
     @Override
     public JobExecution getExecution() {

stack/core/src/main/java/org/usergrid/batch/JobFactory.java → stack/core/src/main/java/org/apache/usergrid/batch/JobFactory.java

@@ -1,9 +1,9 @@
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 import java.util.List;
 
-import org.usergrid.batch.repository.JobDescriptor;
+import org.apache.usergrid.batch.repository.JobDescriptor;
 
 
 /**

stack/core/src/main/java/org/usergrid/batch/JobNotFoundException.java → stack/core/src/main/java/org/apache/usergrid/batch/JobNotFoundException.java

@@ -1,4 +1,4 @@
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 /**

stack/core/src/main/java/org/usergrid/batch/JobRuntime.java → stack/core/src/main/java/org/apache/usergrid/batch/JobRuntime.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 import java.util.UUID;

stack/core/src/main/java/org/usergrid/batch/JobRuntimeException.java → stack/core/src/main/java/org/apache/usergrid/batch/JobRuntimeException.java

@@ -1,4 +1,4 @@
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 /**

stack/core/src/main/java/org/usergrid/batch/UsergridJobFactory.java → stack/core/src/main/java/org/apache/usergrid/batch/UsergridJobFactory.java

@@ -1,4 +1,4 @@
-package org.usergrid.batch;
+package org.apache.usergrid.batch;
 
 
 import java.util.Collections;
@@ -8,7 +8,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.usergrid.batch.repository.JobDescriptor;
+import org.apache.usergrid.batch.repository.JobDescriptor;
 
 
 /** @author tnine */

stack/core/src/main/java/org/usergrid/batch/job/OnlyOnceJob.java → stack/core/src/main/java/org/apache/usergrid/batch/job/OnlyOnceJob.java

@@ -13,19 +13,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  ******************************************************************************/
-package org.usergrid.batch.job;
+package org.apache.usergrid.batch.job;
 
 
 import java.util.concurrent.TimeUnit;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.usergrid.batch.Job;
-import org.usergrid.batch.JobExecution;
-import org.usergrid.locking.Lock;
-import org.usergrid.locking.LockManager;
+import org.apache.usergrid.batch.Job;
+import org.apache.usergrid.batch.JobExecution;
+import org.apache.usergrid.locking.Lock;
+import org.apache.usergrid.locking.LockManager;
 
-import static org.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
+import static org.apache.usergrid.persistence.cassandra.CassandraService.MANAGEMENT_APPLICATION_ID;
 
 
 /**
@@ -51,7 +51,7 @@ public OnlyOnceJob() {
     /*
      * (non-Javadoc)
      *
-     * @see org.usergrid.batch.Job#execute(org.usergrid.batch.JobExecution)
+     * @see org.apache.usergrid.batch.Job#execute(org.apache.usergrid.batch.JobExecution)
      */
     @Override
     public void execute( JobExecution execution ) throws Exception {

stack/core/src/main/java/org/usergrid/batch/repository/package-info.java → stack/core/src/main/java/org/apache/usergrid/batch/job/package-info.java

@@ -15,4 +15,4 @@
  * limitations under the License.
  */
 
-package org.usergrid.batch.repository;
+package org.apache.usergrid.batch.job;

stack/core/src/main/java/org/usergrid/batch/repository/JobAccessor.java → stack/core/src/main/java/org/apache/usergrid/batch/repository/JobAccessor.java

@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-package org.usergrid.batch.repository;
+package org.apache.usergrid.batch.repository;
 
 
 import java.util.List;
 
-import org.usergrid.batch.JobExecution;
+import org.apache.usergrid.batch.JobExecution;
 
 
 public interface JobAccessor {