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/09/12 09:13:00 UTC
svn commit: r1169622 - in /incubator/rave/trunk/rave-commons: ./
src/main/java/org/apache/rave/jdbc/util/
src/main/java/org/apache/rave/persistence/jpa/
src/test/java/org/apache/rave/jdbc/util/ src/test/resources/
Author: jasha
Date: Mon Sep 12 07:13:00 2011
New Revision: 1169622
URL: http://svn.apache.org/viewvc?rev=1169622&view=rev
Log:
RAVE-244 failure of reading initial data should not lead to missing webapp
Don't log an exception AND throw it
Add logging configuration to the rave-commons module
Added:
incubator/rave/trunk/rave-commons/src/test/resources/log4j.xml
- copied, changed from r1166534, incubator/rave/trunk/rave-portal/src/test/resources/log4j.xml
Modified:
incubator/rave/trunk/rave-commons/pom.xml
incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java
incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java
incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/jdbc/util/DataSourcePopulatorTest.java
Modified: incubator/rave/trunk/rave-commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/pom.xml?rev=1169622&r1=1169621&r2=1169622&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/pom.xml (original)
+++ incubator/rave/trunk/rave-commons/pom.xml Mon Sep 12 07:13:00 2011
@@ -37,6 +37,22 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
Modified: incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java?rev=1169622&r1=1169621&r2=1169622&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java (original)
+++ incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/jdbc/util/DataSourcePopulator.java Mon Sep 12 07:13:00 2011
@@ -131,8 +131,7 @@ public class DataSourcePopulator impleme
executeScripts(conn, scriptLocations);
}
} catch (SQLException e) {
- logger.error("Error querying or populating database", e);
- throw new RuntimeException(e);
+ throw new RuntimeException("Error querying or populating database", e);
} finally {
closeConnection(conn);
}
Modified: incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java?rev=1169622&r1=1169621&r2=1169622&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java (original)
+++ incubator/rave/trunk/rave-commons/src/main/java/org/apache/rave/persistence/jpa/PopulatedLocalContainerEntityManagerFactory.java Mon Sep 12 07:13:00 2011
@@ -20,6 +20,8 @@
package org.apache.rave.persistence.jpa;
import org.apache.rave.jdbc.util.DataSourcePopulator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean;
import javax.persistence.EntityManagerFactory;
@@ -34,6 +36,7 @@ import javax.persistence.spi.Persistence
*/
public class PopulatedLocalContainerEntityManagerFactory extends LocalContainerEntityManagerFactoryBean {
private static final long serialVersionUID = 1L;
+ private static final Logger logger = LoggerFactory.getLogger(PopulatedLocalContainerEntityManagerFactory.class);
private DataSourcePopulator populator;
@@ -57,7 +60,11 @@ public class PopulatedLocalContainerEnti
if (populator != null) {
//Create an entity manager to force initialization of the context and then populate
emf.createEntityManager().close();
- populator.initialize(this.getDataSource());
+ try {
+ populator.initialize(this.getDataSource());
+ } catch (RuntimeException e) {
+ logger.error("Database population has failed. It will be empty.", e);
+ }
}
super.postProcessEntityManagerFactory(emf, pui);
}
Modified: incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/jdbc/util/DataSourcePopulatorTest.java
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/jdbc/util/DataSourcePopulatorTest.java?rev=1169622&r1=1169621&r2=1169622&view=diff
==============================================================================
--- incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/jdbc/util/DataSourcePopulatorTest.java (original)
+++ incubator/rave/trunk/rave-commons/src/test/java/org/apache/rave/jdbc/util/DataSourcePopulatorTest.java Mon Sep 12 07:13:00 2011
@@ -24,7 +24,6 @@ import org.springframework.core.io.Class
import org.springframework.core.io.Resource;
import javax.sql.DataSource;
-import java.io.IOException;
import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -32,7 +31,11 @@ import java.sql.Statement;
import java.util.ArrayList;
import java.util.List;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.createNiceMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
Copied: incubator/rave/trunk/rave-commons/src/test/resources/log4j.xml (from r1166534, incubator/rave/trunk/rave-portal/src/test/resources/log4j.xml)
URL: http://svn.apache.org/viewvc/incubator/rave/trunk/rave-commons/src/test/resources/log4j.xml?p2=incubator/rave/trunk/rave-commons/src/test/resources/log4j.xml&p1=incubator/rave/trunk/rave-portal/src/test/resources/log4j.xml&r1=1166534&r2=1169622&rev=1169622&view=diff
==============================================================================
--- incubator/rave/trunk/rave-portal/src/test/resources/log4j.xml (original)
+++ incubator/rave/trunk/rave-commons/src/test/resources/log4j.xml Mon Sep 12 07:13:00 2011
@@ -33,13 +33,11 @@
<!-- Springframework logger -->
<logger name="org.springframework">
<level value="info" />
- <appender-ref ref="console" />
</logger>
<!-- Rave logger -->
<logger name="org.apache.rave">
<level value="debug" />
- <appender-ref ref="console" />
</logger>
<!-- Root Logger -->