You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by mf...@apache.org on 2013/01/16 16:57:50 UTC
svn commit: r1434001 - in /rave/trunk:
rave-components/rave-mongodb/src/main/resources/org/apache/rave/
rave-components/rave-mongodb/src/test/resources/
rave-portal-resources/src/main/resources/ rave-portal/src/test/resources/
rave-providers/rave-opens...
Author: mfranklin
Date: Wed Jan 16 15:57:49 2013
New Revision: 1434001
URL: http://svn.apache.org/viewvc?rev=1434001&view=rev
Log:
Added additional Mongo configuration options (RAVE-873)
Modified:
rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/persistence-applicationContext.xml
rave/trunk/rave-components/rave-mongodb/src/test/resources/portal.properties
rave/trunk/rave-portal-resources/src/main/resources/portal.properties
rave/trunk/rave-portal/src/test/resources/portal.properties
rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties
Modified: rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/persistence-applicationContext.xml
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/persistence-applicationContext.xml?rev=1434001&r1=1434000&r2=1434001&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/persistence-applicationContext.xml (original)
+++ rave/trunk/rave-components/rave-mongodb/src/main/resources/org/apache/rave/persistence-applicationContext.xml Wed Jan 16 15:57:49 2013
@@ -32,12 +32,26 @@
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd">
<mongo:db-factory id="mongoFactory"
- host="${mongo.host}"
- port="${mongo.port}"
+ mongo-ref="mongo"
dbname="${mongo.database}"
username="${mongo.username}"
password="${mongo.password}"/>
+ <mongo:mongo id="mongo" host="${mongo.host}" port="${mongo.port}" >
+ <mongo:options
+ connections-per-host="${mongo.connectionsPerHost}"
+ threads-allowed-to-block-for-connection-multiplier="${mongo.threadsAllowedToBlockForConnectionMultiplier}"
+ connect-timeout="${mongo.connectTimeout}"
+ max-wait-time="${mongo.maxWaitTime}"
+ auto-connect-retry="${mongo.autoConnectRetry}"
+ socket-keep-alive="${mongo.socketKeepAlive}"
+ socket-timeout="${mongo.socketTimeout}"
+ slave-ok="${mongo.slaveOk}"
+ write-number="1"
+ write-timeout="0"
+ write-fsync="true"/>
+ </mongo:mongo>
+
<bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
<constructor-arg name="mongoDbFactory" ref="mongoFactory"/>
</bean>
Modified: rave/trunk/rave-components/rave-mongodb/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-mongodb/src/test/resources/portal.properties?rev=1434001&r1=1434000&r2=1434001&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-mongodb/src/test/resources/portal.properties (original)
+++ rave/trunk/rave-components/rave-mongodb/src/test/resources/portal.properties Wed Jan 16 15:57:49 2013
@@ -38,6 +38,14 @@ portal.page.default_name=Main
###################################################################
mongo.host=localhost
mongo.port=27017
+mongo.connectionsPerHost=10
+mongo.threadsAllowedToBlockForConnectionMultiplier=10
+mongo.connectTimeout=10000
+mongo.maxWaitTime=12000
+mongo.autoConnectRetry=true
+mongo.socketKeepAlive=true
+mongo.socketTimeout=60000
+mongo.slaveOk=true
provider.wookie.wookieServerUrl=http://localhost:8080/wookie
provider.wookie.wookieApiKey=TEST
Modified: rave/trunk/rave-portal-resources/src/main/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources/portal.properties?rev=1434001&r1=1434000&r2=1434001&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/resources/portal.properties (original)
+++ rave/trunk/rave-portal-resources/src/main/resources/portal.properties Wed Jan 16 15:57:49 2013
@@ -66,6 +66,14 @@ mongo.port=27017
mongo.database=rave
mongo.username=
mongo.password=
+mongo.connectionsPerHost=10
+mongo.threadsAllowedToBlockForConnectionMultiplier=10
+mongo.connectTimeout=10000
+mongo.maxWaitTime=12000
+mongo.autoConnectRetry=true
+mongo.socketKeepAlive=true
+mongo.socketTimeout=60000
+mongo.slaveOk=true
provider.wookie.wookieServerUrl=http://localhost:8080/wookie
Modified: rave/trunk/rave-portal/src/test/resources/portal.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/portal.properties?rev=1434001&r1=1434000&r2=1434001&view=diff
==============================================================================
--- rave/trunk/rave-portal/src/test/resources/portal.properties (original)
+++ rave/trunk/rave-portal/src/test/resources/portal.properties Wed Jan 16 15:57:49 2013
@@ -58,6 +58,14 @@ mongo.port=27017
mongo.database=rave
mongo.username=
mongo.password=
+mongo.connectionsPerHost=10
+mongo.threadsAllowedToBlockForConnectionMultiplier=10
+mongo.connectTimeout=10000
+mongo.maxWaitTime=12000
+mongo.autoConnectRetry=true
+mongo.socketKeepAlive=true
+mongo.socketTimeout=60000
+mongo.slaveOk=true
provider.wookie.wookieServerUrl=http://localhost:8080/wookie
provider.wookie.wookieApiKey=TEST
Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties
URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties?rev=1434001&r1=1434000&r2=1434001&view=diff
==============================================================================
--- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties (original)
+++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties Wed Jan 16 15:57:49 2013
@@ -59,6 +59,14 @@ mongo.port=27017
mongo.database=rave
mongo.username=
mongo.password=
+mongo.connectionsPerHost=10
+mongo.threadsAllowedToBlockForConnectionMultiplier=10
+mongo.connectTimeout=10000
+mongo.maxWaitTime=12000
+mongo.autoConnectRetry=true
+mongo.socketKeepAlive=true
+mongo.socketTimeout=60000
+mongo.slaveOk=true
#################################################################################