usergrid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sfeld...@apache.org
Subject [12/18] incubator-usergrid git commit: Fixes readme for settings.xml and set defaults in pom.xml
Date Sat, 21 Feb 2015 13:40:27 GMT
Fixes readme for settings.xml and set defaults in 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/14051bcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/14051bcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/14051bcf

Branch: refs/heads/USERGRID-273-indexbuffer
Commit: 14051bcfb4785d1c062a938caf38788230558f0c
Parents: 399d60e
Author: Todd Nine <tnine@apigee.com>
Authored: Wed Feb 18 11:32:47 2015 -0800
Committer: Todd Nine <tnine@apigee.com>
Committed: Wed Feb 18 11:32:47 2015 -0800

----------------------------------------------------------------------
 stack/rest/README.md                         | 3 ++-
 stack/rest/pom.xml                           | 3 ++-
 stack/rest/src/test/resources/arquillian.xml | 1 -
 3 files changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/14051bcf/stack/rest/README.md
----------------------------------------------------------------------
diff --git a/stack/rest/README.md b/stack/rest/README.md
index 33f9469..bd0034d 100644
--- a/stack/rest/README.md
+++ b/stack/rest/README.md
@@ -97,5 +97,6 @@ JAVA_OPTS="$JAVA_OPTS -Dcom.sun.management.jmxremote.authenticate=false"
 Add the following properties to you maven settings.xml
 
 ```xml
- <catalina.home>[path to your tomcat directory]</catalina.home>
+<catalina.host>localhost</catalina.host>
+<catalina.jmx.port>8089</catalina.jmx.port>
  ```

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/14051bcf/stack/rest/pom.xml
----------------------------------------------------------------------
diff --git a/stack/rest/pom.xml b/stack/rest/pom.xml
index e6113bc..e07e218 100644
--- a/stack/rest/pom.xml
+++ b/stack/rest/pom.xml
@@ -33,7 +33,8 @@
     <properties>
         <usergrid.rest.threads>8</usergrid.rest.threads>
         <guice.version>4.0-beta5</guice.version>
-        <catalina.home>OVERRIDE_ME_IN_SETTINGS>XML</catalina.home>
+        <catalina.host>localhost</catalina.host>
+        <catalina.jmx.port>8089</catalina.jmx.port>
     </properties>
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/14051bcf/stack/rest/src/test/resources/arquillian.xml
----------------------------------------------------------------------
diff --git a/stack/rest/src/test/resources/arquillian.xml b/stack/rest/src/test/resources/arquillian.xml
index d73395e..f6adcfc 100644
--- a/stack/rest/src/test/resources/arquillian.xml
+++ b/stack/rest/src/test/resources/arquillian.xml
@@ -50,7 +50,6 @@
             <property name="user">usergrid</property>
             <property name="pass">testpassword</property>
             <!--This is a workaround for this issue https://issues.jboss.org/browse/ARQ-1814-->
-            <property name="catalinaBase">${catalina.home}</property>
             <property name="jmxPort">${catalina.jmx.port}</property>
         </configuration>
     </container>


Mime
View raw message