usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject [35/50] git commit: Updated properties to use system properties for Archaius config
Date Wed, 12 Feb 2014 13:21:43 GMT
Updated properties to use system properties for Archaius config


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

Branch: refs/heads/optimistic-tx-semantics
Commit: df41a94ff2cc05d547ee449eafc4d80b928efca1
Parents: 8990530
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Feb 5 12:26:28 2014 -0700
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Feb 5 12:26:28 2014 -0700

----------------------------------------------------------------------
 stack/corepersistence/collection/pom.xml        | 20 +-----------
 .../collection/guice/CollectionModule.java      | 29 -----------------
 stack/corepersistence/pom.xml                   | 33 +++++++++++++++-----
 3 files changed, 27 insertions(+), 55 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/df41a94f/stack/corepersistence/collection/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/pom.xml b/stack/corepersistence/collection/pom.xml
index d7b3b06..4555264 100644
--- a/stack/corepersistence/collection/pom.xml
+++ b/stack/corepersistence/collection/pom.xml
@@ -22,25 +22,7 @@
   <artifactId>collection</artifactId>
 
   <build>
-    <resources>
-      <resource>
-        <directory>src/main/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </resource>
-    </resources>
-
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>**/*.properties</include>
-        </includes>
-      </testResource>
-    </testResources>
+
 
     <plugins>
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/df41a94f/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
index 83f7d42..95bc760 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/guice/CollectionModule.java
@@ -55,35 +55,6 @@ import rx.Scheduler;
  */
 public class CollectionModule extends AbstractModule {
 
-//    static {
-//        /*
-//         * --------------------------------------------------------------------
-//         * Archaius Configuration Settings
-//         * --------------------------------------------------------------------
-//         */
-//
-//        try {
-//            ConfigurationManager.loadCascadedPropertiesFromResources( "usergrid" );
-//        }
-//        catch ( IOException e ) {
-//            throw new RuntimeException( "Cannot do much without properly loading our configuration.",
e );
-//        }
-
-//        Injector injector = Guice.createInjector( new GuicyFigModule( CassandraFig.class,
RxFig.class ) );
-//        CassandraFig cassandraFig = injector.getInstance( CassandraFig.class );
-//        RxFig rxFig = injector.getInstance( RxFig.class );
-//
-//        Env env = Env.getEnvironment();
-//        if ( env == Env.UNIT || env == Env.ALL ) {
-//            String thriftPort = String.valueOf( AvailablePortFinder.getNextAvailable()
);
-//            cassandraFig.bypass( "getThriftPort", thriftPort );
-//            cassandraFig.bypass( "getConnections", "20" );
-//            rxFig.bypass( "getMaxThreadCount", "20" );
-//            cassandraFig.bypass( "getHosts", "localhost" );
-//            cassandraFig.bypass( "getClusterName", "Usergrid" );
-//            cassandraFig.bypass( "getKeyspaceName", "Usergrid_Collections" );
-//        }
-//    }
 
     @Override
     protected void configure() {

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/df41a94f/stack/corepersistence/pom.xml
----------------------------------------------------------------------
diff --git a/stack/corepersistence/pom.xml b/stack/corepersistence/pom.xml
index e8a52b8..4cc845a 100644
--- a/stack/corepersistence/pom.xml
+++ b/stack/corepersistence/pom.xml
@@ -13,6 +13,7 @@
   <version>1.0-SNAPSHOT</version>
 
   <properties>
+    <surefire.version>2.16</surefire.version>
     <astyanax.version>1.56.48</astyanax.version>
     <jukito.version>1.4-UG</jukito.version>
     <guice.version>3.0</guice.version>
@@ -38,12 +39,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.16</version>
-          <configuration>
-             <environmentVariables>
-               <archaius.deployment.environment>UNIT</archaius.deployment.environment>
-             </environmentVariables>
-           </configuration>
+          <version>${surefire.version}</version>
         </plugin>
       </plugins>
     </pluginManagement>
@@ -52,12 +48,15 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.16</version>
+        <version>${surefire.version}</version>
         <configuration>
           <includes>
             <include>**/*Test.java</include>
             <include>**/*IT.java</include>
           </includes>
+          <systemPropertyVariables>
+            <archaius.deployment.environment>UNIT</archaius.deployment.environment>
+          </systemPropertyVariables>
         </configuration>
       </plugin>
 
@@ -75,6 +74,26 @@
       </plugin>
     </plugins>
 
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </resource>
+    </resources>
+
+    <testResources>
+      <testResource>
+        <directory>src/test/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>**/*.properties</include>
+        </includes>
+      </testResource>
+    </testResources>
+
   </build>
 
   <repositories>


Mime
View raw message