Permalink
Browse files

Rename deployment properties file back to usergrid-deployment.propert…

…ies as it was in UG1.
  • Loading branch information...
Dave Johnson
Dave Johnson committed Sep 21, 2014
1 parent 636d2ca commit 4e6bd28078c525e39220f6da7e264c7e3cb0b7f4
View
@@ -30,10 +30,10 @@ DS_Store
/console/.gitignore
/websocket/${activemq.base}/
/tools/export/
/config/src/main/resources/usergrid-custom.properties
/config/src/main/resources/usergrid-deployment.properties
/config/src/test/resources/usergrid-custom-test.properties
/standalone/usergrid-custom-standalone.properties
/rest/src/main/resources/usergrid-custom.properties
/rest/src/main/resources/usergrid-deployment.properties
usergrid-custom*
View
@@ -27,13 +27,13 @@ Make sure you're only running with cassandra.use_remote=false when testing and
that you're running with cassandra.use_remote=true when running in production.
You can override the properties by having a file named
usergrid-custom.properties in the classpath. This will get loaded after the
usergrid-deployment.properties in the classpath. This will get loaded after the
usergrid.properties file is loaded and will override any values with the same
names. This makes it easier to keep confidential credentials out of source
code version control.
The custom properties file location can be overriden at build-time by passing
the file location as a property parameter to maven. For example:
mvn clean install -Dusergrid-custom-spring-properties=classpath:/usergrid-custom.properties
mvn clean install -Dusergrid-custom-spring-properties=classpath:/usergrid-deployment.properties
@@ -22,7 +22,7 @@
# configuration settings here if you plan to push
# this to GitHub
#
# Put your settings in usergrid-custom.properties
# Put your settings in usergrid-deployment.properties
# instead.
#
@@ -17,7 +17,7 @@ To launch an embedded Cassandra server and initialize the database:
java -jar usergrid-launcher-${version}.jar -nogui -db -init
The standalone server will load a usergrid-custom.properties file from the
The standalone server will load a usergrid-deployment.properties file from the
same location as the jar file. You can override things like the location of
the Cassandra cluster in that file.
@@ -33,7 +33,7 @@
<list>
<value>classpath:/usergrid-default.properties</value>
<value>classpath:/usergrid-standalone.properties</value>
<value>classpath:/usergrid-custom.properties</value>
<value>classpath:/usergrid-deployment.properties</value>
<value>file:./usergrid-custom-standalone.properties</value>
</list>
</property>
View
@@ -89,7 +89,7 @@
<ug.heapmin>2048m</ug.heapmin>
<ug.argline>-Djava.awt.headless=true</ug.argline>
<usergrid-custom-spring-properties>classpath:/usergrid-custom.properties</usergrid-custom-spring-properties>
<usergrid-custom-spring-properties>classpath:/usergrid-deployment.properties</usergrid-custom-spring-properties>
<usergrid-custom-spring-test-properties>classpath:/usergrid-custom-test.properties</usergrid-custom-spring-test-properties>
<!-- =================================================================== -->
@@ -291,7 +291,7 @@ public void run() {
private void createPropertyFilesForForkedTomcat( String propDirPath ) throws IOException {
PrintWriter pw = new PrintWriter(
new FileWriter( propDirPath + File.separator + "usergrid-custom.properties"));
new FileWriter( propDirPath + File.separator + "usergrid-deployment.properties"));
pw.println("cassandra.url=localhost:" + cassPort);
pw.println("cassandra.version=1.2");
@@ -365,7 +365,7 @@ private void createPropertyFilesForForkedTomcat( String propDirPath ) throws IOE
// allProperties.put("elasticsearch.port", ""+esPort );
//
// PrintWriter pw = new PrintWriter(
// new FileWriter( propDirPath + File.separator + "usergrid-custom.properties"));
// new FileWriter( propDirPath + File.separator + "usergrid-deployment.properties"));
// for ( String name : allProperties.keySet() ) {
// pw.println(name + "=" + allProperties.get( name ));
// }
View
@@ -24,13 +24,13 @@ And then you will find the following directory structure (Where X.Y.Z is the ver
README.md
usergrid-tools.jar
usergrid-export.sh
usergrid-custom.properties
usergrid-deployment.properties
These are the important files:
* __usergrid-tools.jar__: this is the Usergrid Tools executable
* __usergrid-export.sh__: this is a shell script design to be run as a cron scheduled task
* __usergrid-custom.properties__: this is the configuration file, refer to the documentation for the tool you are running to learn what properties are required.
* __usergrid-deployment.properties__: this is the configuration file, refer to the documentation for the tool you are running to learn what properties are required.
How to run the Usergrid Tools

0 comments on commit 4e6bd28

Please sign in to comment.