Modified: rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml?rev=1399504&r1=1399503&r2=1399504&view=diff ============================================================================== --- rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml (original) +++ rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml Thu Oct 18 01:32:02 2012 @@ -50,39 +50,8 @@ <context:component-scan base-package="org.apache.rave.opensocial" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.service" annotation-config="true"/> - <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> - <property name="entityManagerFactory" ref="entityManagerFactory"/> - </bean> - - <tx:annotation-driven transaction-manager="transactionManager"/> + <import resource="classpath*:org/apache/rave/persistence-applicationContext.xml" /> - <bean id="entityManagerFactory" - class="org.apache.rave.persistence.jpa.PopulatedLocalContainerEntityManagerFactory"> - <property name="persistenceUnitName" value="ravePersistenceUnit"/> - <property name="dataSource" ref="dataSource"/> - <property name="populator" ref="dataSourcePopulator"/> - <property name="jpaVendorAdapter"> - <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" - p:databasePlatform="${rave-shindig.jpaVendorAdapter.databasePlatform}" - p:database="${rave-shindig.jpaVendorAdapter.database}" - p:showSql="${rave-shindig.jpaVendorAdapter.showSql}"/> - </property> - <property name="jpaPropertyMap"> - <map> - <entry key="openjpa.Log" value="${rave-shindig.openjpa.Log}"/> - <entry key="openjpa.RuntimeUnenhancedClasses" value="${rave-shindig.openjpa.RuntimeUnenhancedClasses}"/> - <entry key="openjpa.jdbc.SynchronizeMappings" value="${rave-shindig.openjpa.jdbc.SynchronizeMappings}"/> - <entry key="openjpa.jdbc.MappingDefaults" value="${rave-shindig.openjpa.jdbc.MappingDefaults}"/> - </map> - </property> - </bean> - - <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> - <property name="url" value="${rave-shindig.dataSource.url}"/> - <property name="driverClassName" value="${rave-shindig.dataSource.driver}"/> - <property name="username" value="${rave-shindig.dataSource.username}"/> - <property name="password" value="${rave-shindig.dataSource.password}"/> - </bean> <bean id="oAuthStore" class="org.apache.rave.gadgets.oauth.inject.DefaultOAuthStore"> <constructor-arg name="defaultCallbackUrl" value="${shindig.signing.global-callback-url}"/>
Modified: rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties URL: http://svn.apache.org/viewvc/rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties?rev=1399504&r1=1399503&r2=1399504&view=diff ============================================================================== --- rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties (original) +++ rave/branches/mongo/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig/src/main/resources/rave.shindig.properties Thu Oct 18 01:32:02 2012 @@ -35,21 +35,28 @@ shindig.spring.base-package=org.apache.r # Default Rave Shindig database settings with in memory H2 database # rave.database.location is replaced during the build -rave-shindig.dataSource.url=jdbc:h2:${rave.database.location};AUTO_SERVER=TRUE -rave-shindig.dataSource.driver=org.h2.Driver -rave-shindig.dataSource.username=sa -rave-shindig.dataSource.password=local - -rave-shindig.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect -rave-shindig.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary -rave-shindig.jpaVendorAdapter.database=H2 +jpa.dataSource.url=jdbc:h2:${rave.database.location};AUTO_SERVER=TRUE +jpa.dataSource.driver=org.h2.Driver +jpa.dataSource.username=sa +jpa.dataSource.password=local + +jpa.jpaDialect=org.apache.rave.persistence.jpa.impl.H2OpenJpaDialect +jpa.jpaVendorAdapter.databasePlatform=org.apache.openjpa.jdbc.sql.H2Dictionary +jpa.jpaVendorAdapter.database=H2 # General Rave Shindig database settings -rave-shindig.jpaVendorAdapter.showSql=true -rave-shindig.openjpa.Log=DefaultLevel=WARN, Runtime=WARN, Tool=WARN, SQL=WARN -rave-shindig.openjpa.RuntimeUnenhancedClasses=warn -rave-shindig.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true) -rave-shindig.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict +jpa.jpaVendorAdapter.showSql=true +jpa.openjpa.Log=DefaultLevel=WARN, Runtime=WARN, Tool=WARN, SQL=WARN +jpa.openjpa.RuntimeUnenhancedClasses=warn +jpa.openjpa.jdbc.SynchronizeMappings=buildSchema(ForeignKeys=true) +jpa.openjpa.jdbc.MappingDefaults=ForeignKeyDeleteAction=restrict, JoinForeignKeyDeleteAction=restrict + +################################################################### +# Properties related to the Rave MongoDB implementation # +################################################################### +mongo.host=localhost +mongo.port=27017 + ################################################################################# ## These properties are a copy/paste from the default shindig.properties file. ##
