[parancoe] 3 new revisions pushed by lucio.be...@gmail.com on 2013-08-10 05:36 GMT

[para...@googlecode.com]

3 new revisions:

Revision: 850c538512c2
Branch: default
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Mon Jul 1 12:25:38 2013
Log: Added subpackages to the messages search locations.
http://code.google.com/p/parancoe/source/detail?r=850c538512c2

Revision: 522094594479
Branch: default
Author: Michele Franzin <michele...@gmail.com>
Date: Fri Aug 9 04:04:07 2013
Log: used DaoUtils in PopulateInitialDataContextListener
http://code.google.com/p/parancoe/source/detail?r=522094594479

Revision: eca5d8270aa3
Branch: default
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Fri Aug 9 22:31:57 2013
Log: Merged Franzin's updates
http://code.google.com/p/parancoe/source/detail?r=eca5d8270aa3

==============================================================================
Revision: 850c538512c2
Branch: default
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Mon Jul 1 12:25:38 2013
Log: Added subpackages to the messages search locations.
http://code.google.com/p/parancoe/source/detail?r=850c538512c2

Modified:
/parancoe-web/src/main/resources/org/parancoe/web/parancoeBase.xml

=======================================
--- /parancoe-web/src/main/resources/org/parancoe/web/parancoeBase.xml Mon
Jun 24 10:12:26 2013
+++ /parancoe-web/src/main/resources/org/parancoe/web/parancoeBase.xml Mon
Jul 1 12:25:38 2013
@@ -48,7 +48,7 @@
<!-- i18n -->
<bean id="messageSource"

class="org.parancoe.web.util.ReloadableResourceBundleMessageSource">
- <property name="basenames"
value="classpath*:messages,/WEB-INF/messages"/>
+ <property name="basenames"
value="classpath*:**/messages,/WEB-INF/messages"/>
<property name="useCodeAsDefaultMessage" value="true"/>
<property name="cacheSeconds" value="1"/>
<property name="resourceLoader">

==============================================================================
Revision: 522094594479
Branch: default
Author: Michele Franzin <michele...@gmail.com>
Date: Fri Aug 9 04:04:07 2013
Log: used DaoUtils in PopulateInitialDataContextListener
http://code.google.com/p/parancoe/source/detail?r=522094594479

Modified:

/parancoe-web/src/main/java/org/parancoe/web/PopulateInitialDataContextListener.java

=======================================
---
/parancoe-web/src/main/java/org/parancoe/web/PopulateInitialDataContextListener.java
Wed Feb 27 08:46:53 2013
+++
/parancoe-web/src/main/java/org/parancoe/web/PopulateInitialDataContextListener.java
Fri Aug 9 04:04:07 2013
@@ -23,10 +23,10 @@

import org.hibernate.Session;
import org.hibernate.SessionFactory;
-import org.lambico.dao.DaoProvider;
import org.lambico.dao.generic.GenericDaoBase;
import org.lambico.dao.spring.hibernate.GenericDaoHibernateSupport;
import org.lambico.data.YamlFixtureHelper;
+import org.lambico.spring.dao.DaoUtils;
import org.parancoe.web.plugin.ApplicationContextPlugin;
import org.parancoe.web.plugin.PluginHelper;
import org.slf4j.Logger;
@@ -45,12 +45,8 @@
*/
public class PopulateInitialDataContextListener extends
ContextLoaderListener {

- private static final String DAO_PROVIDER_ID = "daos";
-
private static final Logger log =
LoggerFactory.getLogger(PopulateInitialDataContextListener.class);
-
private ApplicationContext ctx;
-
protected List<Class> clazzToPopulate = new ArrayList<Class>();

@Override
@@ -67,14 +63,14 @@
fixtureClasses);
log.info("Populating initial data for models...");

- SessionFactory sessionFactory =
(SessionFactory)ctx.getBean("sessionFactory");
+ SessionFactory sessionFactory = (SessionFactory)
ctx.getBean("sessionFactory");
Session session = sessionFactory.openSession();
session.beginTransaction();
//Attach transaction to thread
TransactionSynchronizationManager.bindResource(sessionFactory, new
SessionHolder(session));
TransactionSynchronizationManager.initSynchronization();

- try{
+ try {
for (Class clazz : fixtures.keySet()) {
List modelFixtures = fixtures.get(clazz);
if (modelFixtures.isEmpty()) {
@@ -113,7 +109,8 @@
try {
clazzToPopulate.addAll(plugin.getFixtureClasses());
} catch (Exception e) {
- log.error("Impossibile reperire i nomi delle fixtures da
caricare per il plugin {}", plugin.getName());
+ log.error("Impossibile reperire i nomi delle fixtures da
caricare per il plugin {}",
+ plugin.getName());
}
}
return clazzToPopulate;
@@ -121,15 +118,15 @@

private void populateTableForModel(final Class model, final List
fixtures) {
String fixtureName = YamlFixtureHelper.getModelName(model);
- DaoProvider daos = (DaoProvider)ctx.getBean(DAO_PROVIDER_ID);
- GenericDaoBase dao = (GenericDaoBase)daos.getDao(model);
+ GenericDaoBase dao = DaoUtils.getDaoFor(model, ctx);
if (dao == null) {
- log.info("Dao not found for {} and po {}",fixtureName,
YamlFixtureHelper.getModelName(model));
+ log.info("Dao not found for {} and po {}", fixtureName,
model.getCanonicalName());
return;
}
if (dao.count() == 0) {
log.info("Populating {} with {} items...", fixtureName,
fixtures.size());
- final HibernateTemplate template =
((GenericDaoHibernateSupport) dao).getHibernateTemplate();
+ final HibernateTemplate template =
((GenericDaoHibernateSupport) dao).
+ getHibernateTemplate();
try {
for (Object entity : fixtures) {
template.saveOrUpdate(entity);
@@ -137,7 +134,7 @@
template.flush();
template.clear();
} catch (Exception e) {
- log.error("Error populating rows in {} table",
YamlFixtureHelper.getModelName(model), e);
+ log.error("Error populating rows in {} table",
fixtureName, e);
}
log.info("Population of {} done!", fixtureName);
} else {

==============================================================================
Revision: eca5d8270aa3
Branch: default
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Fri Aug 9 22:31:57 2013
Log: Merged Franzin's updates
http://code.google.com/p/parancoe/source/detail?r=eca5d8270aa3