You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2012/11/06 12:13:46 UTC
svn commit: r1406097 - in /incubator/syncope/trunk: ./
core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
core/src/main/resources/persistenceContext.xml
Author: ilgrosso
Date: Tue Nov 6 11:13:46 2012
New Revision: 1406097
URL: http://svn.apache.org/viewvc?rev=1406097&view=rev
Log:
Merge from trunk
Modified:
incubator/syncope/trunk/ (props changed)
incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml
Propchange: incubator/syncope/trunk/
------------------------------------------------------------------------------
Merged /incubator/syncope/branches/1_0_X:r1405276-1406095
Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java?rev=1406097&r1=1406096&r2=1406097&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java (original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/JobInstanceLoader.java Tue Nov 6 11:13:46 2012
@@ -213,7 +213,7 @@ public class JobInstanceLoader {
unregisterJob(getJobName(report));
}
- @Transactional
+ @Transactional(readOnly = true)
public void load() {
// 1. jobs for SchedTasks
Set<SchedTask> tasks = new HashSet(taskDAO.findAll(SchedTask.class));
Modified: incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml?rev=1406097&r1=1406096&r2=1406097&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml (original)
+++ incubator/syncope/trunk/core/src/main/resources/persistenceContext.xml Tue Nov 6 11:13:46 2012
@@ -44,24 +44,25 @@ under the License.
<bean id="xStream" class="com.thoughtworks.xstream.XStream"/>
<!-- Use JNDI datasource as default but, when not available, revert to
- local datasource, with different properties for execution and testing.
- In any case, get all JDBC connections with a determined isolation level. -->
- <bean id="dataSource" class="org.springframework.jdbc.datasource.IsolationLevelDataSourceAdapter">
+ local datasource, with different properties for execution and testing.
+ In any case, get all JDBC connections with a determined isolation level. -->
+ <bean id="dataSource" class="org.springframework.jndi.JndiObjectFactoryBean">
+ <property name="jndiName" value="java:comp/env/jdbc/syncopeDataSource"/>
+ <property name="defaultObject" ref="localDataSource"/>
+ </bean>
+
+ <bean id="localDataSource" class="org.springframework.jdbc.datasource.IsolationLevelDataSourceAdapter">
<property name="targetDataSource">
- <bean class="org.springframework.jndi.JndiObjectFactoryBean">
- <property name="jndiName" value="java:comp/env/jdbc/syncopeDataSource"/>
- <property name="defaultObject" ref="localDataSource"/>
+ <bean class="org.springframework.jdbc.datasource.DriverManagerDataSource">
+ <property name="driverClassName" value="${jpa.driverClassName}"/>
+ <property name="url" value="${jpa.url}"/>
+ <property name="username" value="${jpa.username}"/>
+ <property name="password" value="${jpa.password}"/>
</bean>
</property>
<property name="isolationLevelName" value="ISOLATION_READ_COMMITTED"/>
</bean>
- <bean id="localDataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
- <property name="driverClassName" value="${jpa.driverClassName}"/>
- <property name="url" value="${jpa.url}"/>
- <property name="username" value="${jpa.username}"/>
- <property name="password" value="${jpa.password}"/>
- </bean>
-
+
<bean id="entityManager" class="org.springframework.orm.jpa.support.SharedEntityManagerBean">
<property name="entityManagerFactory" ref="entityManagerFactory"/>
</bean>