You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ja...@apache.org on 2011/08/29 18:32:12 UTC
svn commit: r1162893 - in /incubator/rave/trunk/rave-shindig/src:
main/resources/rave-shindig-applicationContext.xml
main/resources/rave-shindig-dataContext.xml main/webapp/WEB-INF/web.xml
test/resources/rave-shindig-test-dataContext.xml
Author: jasha
Date: Mon Aug 29 16:32:12 2011
New Revision: 1162893
URL: http://svn.apache.org/viewvc?rev=1162893&view=rev
Log:
RAVE-215 move rave-shindig H2 dataSource & H2 console configuration to dataContext Spring configuration
Modified:
incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml
incubator/rave/trunk/rave-shindig/src/test/resources/rave-shindig-test-dataContext.xml
Modified: incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml?rev=1162893&r1=1162892&r2=1162893&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml (original)
+++ incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-applicationContext.xml Mon Aug 29 16:32:12 2011
@@ -28,12 +28,6 @@
<context:property-placeholder location="classpath:rave.shindig.properties" />
<context:component-scan base-package="org.apache.rave" annotation-config="true" />
- <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="url" value="jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1"/>
- <property name="driverClassName" value="org.h2.Driver"/>
- <property name="username" value="sa"/>
- <property name="password" value="local"/>
- </bean>
<bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
<property name="entityManagerFactory" ref="entityManagerFactory"/>
Modified: incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-dataContext.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-dataContext.xml?rev=1162893&r1=1162892&r2=1162893&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-dataContext.xml (original)
+++ incubator/rave/trunk/rave-shindig/src/main/resources/rave-shindig-dataContext.xml Mon Aug 29 16:32:12 2011
@@ -24,8 +24,14 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <property name="url" value="jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1"/>
+ <property name="driverClassName" value="org.h2.Driver"/>
+ <property name="username" value="sa"/>
+ <property name="password" value="local"/>
+ </bean>
- <bean id="dataSourcePopulator" class="org.apache.rave.jdbc.util.DataSourcePopulator" >
+ <bean id="dataSourcePopulator" class="org.apache.rave.jdbc.util.DataSourcePopulator">
<property name="executeScriptQuery" value="SELECT * FROM PERSON"/>
<property name="scriptLocations">
<list>
@@ -34,4 +40,12 @@
</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,22222"/>
+ </bean>
+
+
</beans>
Modified: incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml?rev=1162893&r1=1162892&r2=1162893&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/rave/trunk/rave-shindig/src/main/webapp/WEB-INF/web.xml Mon Aug 29 16:32:12 2011
@@ -328,18 +328,4 @@
<url-pattern>/xpc*</url-pattern>
</servlet-mapping>
-
- <servlet>
- <servlet-name>H2Console</servlet-name>
- <servlet-class>org.h2.server.web.WebServlet</servlet-class>
- <!-- <init-param> <param-name>webAllowOthers</param-name> <param-value></param-value>
- </init-param> <init-param> <param-name>trace</param-name> <param-value></param-value>
- </init-param> -->
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>H2Console</servlet-name>
- <url-pattern>/console/*</url-pattern>
- </servlet-mapping>
-
</web-app>
Modified: incubator/rave/trunk/rave-shindig/src/test/resources/rave-shindig-test-dataContext.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-shindig/src/test/resources/rave-shindig-test-dataContext.xml?rev=1162893&r1=1162892&r2=1162893&view=diff
==============================================================================
--- incubator/rave/trunk/rave-shindig/src/test/resources/rave-shindig-test-dataContext.xml (original)
+++ incubator/rave/trunk/rave-shindig/src/test/resources/rave-shindig-test-dataContext.xml Mon Aug 29 16:32:12 2011
@@ -25,6 +25,13 @@
http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
+ <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <property name="url" value="jdbc:h2:mem:portal;DB_CLOSE_DELAY=-1"/>
+ <property name="driverClassName" value="org.h2.Driver"/>
+ <property name="username" value="sa"/>
+ <property name="password" value="local"/>
+ </bean>
+
<bean primary="true" id="dataSourcePopulator" class="org.apache.rave.jdbc.util.DataSourcePopulator">
<property name="executeScriptQuery" value="SELECT * FROM PERSON"/>
<property name="scriptLocations">