You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rave.apache.org by ra...@apache.org on 2013/01/28 20:02:21 UTC
svn commit: r1439569 - in /rave/trunk:
rave-components/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java
rave-portal-resources/src/main/resources_jpa/dataContext.xml
Author: raminder
Date: Mon Jan 28 19:02:20 2013
New Revision: 1439569
URL: http://svn.apache.org/viewvc?rev=1439569&view=rev
Log:
changes for RAVE-874. Thanks Dagmar.
Modified:
rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java
rave/trunk/rave-portal-resources/src/main/resources_jpa/dataContext.xml
Modified: rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java
URL: http://svn.apache.org/viewvc/rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java?rev=1439569&r1=1439568&r2=1439569&view=diff
==============================================================================
--- rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java (original)
+++ rave/trunk/rave-components/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java Mon Jan 28 19:02:20 2013
@@ -163,6 +163,7 @@ public class DataSourcePopulator impleme
result = executeScriptQuery == null || !executeQuery(conn, executeScriptQuery).first();
} catch (SQLException e) {
//Only return true if the execption we got is that the table was not found
+ logger.warn("SQL Exception while running the query used to determine if the data should be loaded: "+e.getMessage());
result = e.getMessage().toLowerCase().matches("table \".*\" not found.*\n*.*");
}
logger.debug("Executed query " + executeScriptQuery + " with result " + result);
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=1439569&r1=1439568&r2=1439569&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 Mon Jan 28 19:02:20 2013
@@ -28,7 +28,7 @@
Spring implementation
-->
<bean id="dataSourcePopulator" class="org.apache.rave.jdbc.util.DataSourcePopulator">
- <property name="executeScriptQuery" value="SELECT * FROM WIDGET"/>
+ <property name="executeScriptQuery" value="SELECT * FROM widget"/>
<property name="scriptLocations">
<list>
<value>/WEB-INF/db/initial_data.sql</value>