Modified: rave/trunk/rave-portal-resources/src/main/resources_jpa/dataContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources_jpa/dataContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/resources_jpa/dataContext.xml (original) +++ rave/trunk/rave-portal-resources/src/main/resources_jpa/dataContext.xml Wed Feb 13 18:30:04 2013 @@ -19,19 +19,22 @@ --> <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 that executes the given set of resources (SQL scripts) in order - To remove runtime initialization of initial data, remove this bean and change the entity manager factory to the default - Spring implementation - --> - <bean id="dataSourcePopulator" class="org.apache.rave.jdbc.util.DataSourcePopulator"> - <property name="executeScriptQuery" value="SELECT * FROM widget"/> + <import resource="classpath*:org/apache/rave/persistence-applicationContext.xml" /> + + <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>/WEB-INF/db/initial_data.sql</value> + <value>classpath:db/initial-data.json</value> </list> </property> </bean>
Modified: rave/trunk/rave-portal-resources/src/main/resources_mongo/dataContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/resources_mongo/dataContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/resources_mongo/dataContext.xml (original) +++ rave/trunk/rave-portal-resources/src/main/resources_mongo/dataContext.xml Wed Feb 13 18:30:04 2013 @@ -19,17 +19,22 @@ --> <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";> + <import resource="classpath*:org/apache/rave/persistence-applicationContext.xml" /> + <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>/WEB-INF/db/initial-data.json</value> + <value>classpath:db/initial-data.json</value> </list> </property> </bean> Modified: rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml (original) +++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/applicationContext.xml Wed Feb 13 18:30:04 2013 @@ -146,7 +146,6 @@ be overridden by setting a system proper --> <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"/> <import resource="classpath*:org/apache/rave/w3c-provider-applicationContext.xml"/> Modified: rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java URL: http://svn.apache.org/viewvc/rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java?rev=1445805&r1=1445804&r2=1445805&view=diff ============================================================================== --- rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java (original) +++ rave/trunk/rave-portal/src/test/java/renderer/RenderServiceIntegrationTest.java Wed Feb 13 18:30:04 2013 @@ -56,7 +56,7 @@ import static org.junit.Assert.assertTha @RunWith(SpringJUnit4ClassRunner.class) @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) -@ContextConfiguration(locations = {"classpath:test-dataContext.xml", "classpath:test-applicationContext.xml"}) +@ContextConfiguration(locations = { "classpath:test-applicationContext.xml", "classpath:test-dataContext.xml"}) //@ContextConfiguration(locations = {"file:src/main/webapp/WEB-INF/dataContext.xml", "file:src/main/webapp/WEB-INF/applicationContext.xml"}) public class RenderServiceIntegrationTest {
