Modified: rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml (original) +++ rave/trunk/rave-portal/src/test/resources/test-applicationContext.xml Wed Feb 13 18:30:04 2013 @@ -23,7 +23,6 @@ http://www.springframework.org/schema/beans/spring-beans.xsd";> <import resource="classpath:org/apache/rave/core-applicationContext.xml"/> - <import resource="classpath:org/apache/rave/persistence-applicationContext.xml"/> <import resource="classpath:org/apache/rave/web-applicationContext.xml"/> <import resource="classpath:org/apache/rave/opensocial-provider-applicationContext.xml"/>
Modified: rave/trunk/rave-portal/src/test/resources_jpa/test-dataContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources_jpa/test-dataContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-portal/src/test/resources_jpa/test-dataContext.xml (original) +++ rave/trunk/rave-portal/src/test/resources_jpa/test-dataContext.xml Wed Feb 13 18:30:04 2013 @@ -19,15 +19,67 @@ <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:tx="http://www.springframework.org/schema/tx"; + xmlns:p="http://www.springframework.org/schema/p"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx/spring-tx.xsd";> - <bean id="dataSourcePopulator" class="org.apache.rave.jdbc.util.DataSourcePopulator"> - <property name="executeScriptQuery" value="SELECT * FROM WIDGET"/> + <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager"> + <property name="entityManagerFactory" ref="entityManagerFactory"/> + </bean> + + <tx:annotation-driven transaction-manager="transactionManager"/> + + <bean id="entityManagerFactory" + class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"> + <property name="loadTimeWeaver"> + <bean class="org.springframework.instrument.classloading.InstrumentationLoadTimeWeaver"/> + </property> + <property name="persistenceUnitName" value="ravePersistenceUnit"/> + <property name="dataSource" ref="dataSource"/> + <property name="jpaVendorAdapter"> + <bean class="org.springframework.orm.jpa.vendor.OpenJpaVendorAdapter" + p:databasePlatform="${jpa.jpaVendorAdapter.databasePlatform}" + p:database="${jpa.jpaVendorAdapter.database}" + p:showSql="${jpa.jpaVendorAdapter.showSql}"/> + </property> + <property name="jpaDialect"> + <bean class="${jpa.jpaDialect}"/> + </property> + <property name="jpaPropertyMap"> + <map> + <entry key="openjpa.Log" value="${jpa.openjpa.Log}"/> + <entry key="openjpa.RuntimeUnenhancedClasses" value="${jpa.openjpa.RuntimeUnenhancedClasses}"/> + <entry key="openjpa.jdbc.SynchronizeMappings" value="${jpa.openjpa.jdbc.SynchronizeMappings}"/> + <entry key="openjpa.jdbc.MappingDefaults" value="${jpa.openjpa.jdbc.MappingDefaults}"/> + </map> + </property> + </bean> + + <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource"> + <property name="url" value="${jpa.dataSource.url}"/> + <property name="driverClassName" value="${jpa.dataSource.driver}"/> + <property name="username" value="${jpa.dataSource.username}"/> + <property name="password" value="${jpa.dataSource.password}"/> + </bean> + + <bean id="dataImporter" class="org.apache.rave.portal.util.data.DataImporter"> + <property name="dataExecutor"> + <bean class="org.apache.rave.portal.util.data.DataImporter$ExecutorImpl" /> + </property> <property name="scriptLocations"> <list> - <value>classpath:test-data.sql</value> + <value>classpath:initial-data.json</value> </list> </property> </bean> + + <!-- provides a H2 console to look into the db if necessary --> + <bean id="org.h2.tools.Server-WebServer" class="org.h2.tools.Server" + factory-method="createWebServer" depends-on="dataSource" + init-method="start" lazy-init="false" destroy-method="stop"> + <constructor-arg value="-web,-webPort,11111"/> + </bean> </beans> \ No newline at end of file Modified: rave/trunk/rave-portal/src/test/resources_mongo/test-dataContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/resources_mongo/test-dataContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-portal/src/test/resources_mongo/test-dataContext.xml (original) +++ rave/trunk/rave-portal/src/test/resources_mongo/test-dataContext.xml Wed Feb 13 18:30:04 2013 @@ -19,8 +19,37 @@ --> <beans xmlns="http://www.springframework.org/schema/beans"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xmlns:mongo="http://www.springframework.org/schema/data/mongo"; xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans.xsd";> + http://www.springframework.org/schema/beans/spring-beans.xsd + http://www.springframework.org/schema/data/mongo + http://www.springframework.org/schema/data/mongo/spring-mongo.xsd";> + + <mongo:db-factory id="mongoFactory" + 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> + <bean id="dataImporter" class="org.apache.rave.portal.util.data.DataImporter"> <property name="dataExecutor"> Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-applicationContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-applicationContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-applicationContext.xml (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-applicationContext.xml Wed Feb 13 18:30:04 2013 @@ -50,9 +50,6 @@ <context:component-scan base-package="org.apache.rave.opensocial" annotation-config="true"/> <context:component-scan base-package="org.apache.rave.service" annotation-config="true"/> - <import resource="classpath*:org/apache/rave/persistence-applicationContext.xml" /> - - <bean id="oAuthStore" class="org.apache.rave.gadgets.oauth.inject.DefaultOAuthStore"> <constructor-arg name="defaultCallbackUrl" value="${shindig.signing.global-callback-url}"/> <constructor-arg name="pathToPrivateKey" value="${shindig.signing.key-file}"/> Modified: rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-dataContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-dataContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-dataContext.xml (original) +++ rave/trunk/rave-providers/rave-opensocial-provider/rave-opensocial-server/rave-shindig-resources/src/main/resources/rave-shindig-dataContext.xml Wed Feb 13 18:30:04 2013 @@ -22,12 +22,6 @@ xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd";> - <bean id="dataSourcePopulator" class="org.apache.rave.jdbc.util.DataSourcePopulator"> - <property name="executeScriptQuery" value="SELECT * FROM RAVE_SHINDIG_SEQUENCES"/> - <property name="scriptLocations"> - <list> - <value>classpath:initial_data.sql</value> - </list> - </property> - </bean> + <import resource="classpath*:org/apache/rave/persistence-applicationContext.xml" /> + </beans>
