Revision 48883
Added by Panagiotis Kanakakis over 6 years ago
| modules/uoa-goldoa-service/branches/hibernate/src/test/java/unitest/MonitorTest.java | ||
|---|---|---|
| 60 | 60 |
System.out.println(r.getId() + "/" + r.getProject().getTitle()); |
| 61 | 61 |
} |
| 62 | 62 |
|
| 63 |
// @Test
|
|
| 64 |
// @Transactional
|
|
| 65 |
// @Rollback(true)
|
|
| 66 |
// public void monitorUser(){
|
|
| 67 |
// um.getUsers();
|
|
| 68 |
// }
|
|
| 63 |
@Test |
|
| 64 |
@Transactional |
|
| 65 |
@Rollback(true) |
|
| 66 |
public void monitorUser(){
|
|
| 67 |
um.getUsers(); |
|
| 68 |
} |
|
| 69 | 69 |
|
| 70 | 70 |
} |
| modules/uoa-goldoa-service/branches/hibernate/src/test/resources/applicationContext-goldoa-service-test.xml | ||
|---|---|---|
| 22 | 22 |
</bean> |
| 23 | 23 |
|
| 24 | 24 |
<bean id="executorService" class="java.util.concurrent.Executors" factory-method="newCachedThreadPool" destroy-method="shutdown" /> |
| 25 |
<!--<bean id="eligibilityManager" class="eu.dnetlib.goldoa.service.eligibility.ChainEligibilityManager"> |
|
| 26 |
<property name="managers"> |
|
| 27 |
<list> |
|
| 28 |
<ref bean="projectEligibilityManager"/> |
|
| 29 |
<ref bean="accountingEligibilityManager"/> |
|
| 30 |
<ref bean="organizationEligibilityManager"/> |
|
| 31 |
</list> |
|
| 32 |
</property> |
|
| 33 |
</bean>--> |
|
| 34 | 25 |
|
| 35 |
|
|
| 36 |
|
|
| 37 | 26 |
<context:annotation-config/> |
| 38 | 27 |
|
| 39 | 28 |
<context:property-placeholder location="classpath:applicationContext-goldoa-service.properties" /> |
| modules/uoa-goldoa-service/branches/hibernate/src/test/resources/hibernate-cfg.xml | ||
|---|---|---|
| 8 | 8 |
<hibernate-configuration> |
| 9 | 9 |
<session-factory> |
| 10 | 10 |
<property name="hibernate.hbm2ddl.auto">update</property> |
| 11 |
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL9Dialect</property>
|
|
| 12 |
<property name="show_sql">true</property>
|
|
| 13 |
<property name="connection.pool_size">1</property>
|
|
| 14 |
<property name="format_sql">true</property>
|
|
| 11 |
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL9Dialect</property>
|
|
| 12 |
<property name="show_sql">false</property>
|
|
| 13 |
<property name="connection.pool_size">1</property>
|
|
| 14 |
<property name="format_sql">true</property>
|
|
| 15 | 15 |
|
| 16 |
<!-- enable second level cache and query cache --> |
|
| 17 |
<!--<property name="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.SingletonEhCacheRegionFactory</property>--> |
|
| 18 |
<!--<property name="hibernate.cache.use_second_level_cache">true</property>--> |
|
| 19 |
<!--<property name="hibernate.cache.use_query_cache">true</property>--> |
|
| 20 |
<!--<property name="net.sf.ehcache.configurationResourceName">/ehcache.xml</property>--> |
|
| 21 | 16 |
|
| 22 |
|
|
| 23 | 17 |
<mapping class = "eu.dnetlib.goldoa.domain.User"/> |
| 24 | 18 |
<mapping class = "eu.dnetlib.goldoa.domain.Role"/> |
| 25 | 19 |
<mapping class = "eu.dnetlib.goldoa.domain.UserRole"/> |
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/UserDAO.java | ||
|---|---|---|
| 194 | 194 |
@SuppressWarnings("unchecked")
|
| 195 | 195 |
public List<User> getUsers() {
|
| 196 | 196 |
return createEntityCriteria() |
| 197 |
.addOrder(Order.asc("email")).list();
|
|
| 197 |
.addOrder(Order.asc("email"))
|
|
| 198 |
// .setCacheable(true) |
|
| 199 |
// .setCacheRegion("user")
|
|
| 200 |
.list(); |
|
| 198 | 201 |
} |
| 199 | 202 |
} |
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/dao/HelpDAO.java | ||
|---|---|---|
| 20 | 20 |
|
| 21 | 21 |
|
| 22 | 22 |
public Help saveHelp(Help help) {
|
| 23 |
persist(help);
|
|
| 23 |
getSession().merge(help);
|
|
| 24 | 24 |
return help; |
| 25 | 25 |
} |
| 26 | 26 |
|
| modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/User.java | ||
|---|---|---|
| 1 | 1 |
package eu.dnetlib.goldoa.domain; |
| 2 | 2 |
|
| 3 | 3 |
import com.google.gwt.user.client.rpc.IsSerializable; |
| 4 |
import org.hibernate.annotations.CacheConcurrencyStrategy; |
|
| 4 | 5 |
|
| 5 | 6 |
import javax.persistence.*; |
| 6 | 7 |
import java.util.ArrayList; |
| 7 | 8 |
import java.util.List; |
| 9 |
import org.hibernate.annotations.Cache; |
|
| 8 | 10 |
|
| 9 | 11 |
|
| 10 | 12 |
@Entity |
| 11 | 13 |
@Table(name="\"user\"") |
| 12 |
//@Cache(usage= CacheConcurrencyStrategy.READ_WRITE,region = "user") |
|
| 14 |
//@Cache(usage = CacheConcurrencyStrategy.READ_WRITE,region = "user")
|
|
| 13 | 15 |
public class User implements IsSerializable {
|
| 14 | 16 |
private static final long serialVersionUID = 1L; |
| 15 | 17 |
|
| ... | ... | |
| 42 | 44 |
}, |
| 43 | 45 |
inverseJoinColumns = { @JoinColumn(name = "affiliation",
|
| 44 | 46 |
nullable = false, updatable = false) }) |
| 45 |
//@Cache(usage= CacheConcurrencyStrategy.READ_ONLY) |
|
| 46 | 47 |
private List<Affiliation> affiliations = new ArrayList<>(); |
| 47 | 48 |
|
| 48 | 49 |
@ManyToOne |
| 49 | 50 |
@JoinColumn(name = "publisher") |
| 50 |
//@Cache(usage= CacheConcurrencyStrategy.READ_ONLY) |
|
| 51 | 51 |
private Publisher publisher; |
| 52 | 52 |
|
| 53 | 53 |
@OneToMany(mappedBy = "pk.user", cascade=CascadeType.ALL,fetch = FetchType.LAZY) |
| 54 |
//@Cache(usage= CacheConcurrencyStrategy.READ_WRITE) |
|
| 55 | 54 |
private List<UserRole> roles = new ArrayList<>(); |
| 56 | 55 |
|
| 57 | 56 |
@ManyToMany(fetch = FetchType.LAZY) |
| ... | ... | |
| 59 | 58 |
@JoinColumn(name ="\"user\"", nullable = false, updatable = false)}, |
| 60 | 59 |
inverseJoinColumns = {@JoinColumn(name = "project",
|
| 61 | 60 |
nullable = false, updatable = false) }) |
| 62 |
//@Cache(usage= CacheConcurrencyStrategy.READ_ONLY) |
|
| 63 | 61 |
private List<Project> coordinatedProjects = new ArrayList<>(); |
| 64 | 62 |
|
| 65 | 63 |
public List<UserRole> getRoles() {
|
| modules/uoa-goldoa-service/branches/hibernate/src/main/resources/log4j2.xml | ||
|---|---|---|
| 1 |
<?xml version="1.0" encoding="UTF-8"?> |
|
| 2 |
<Configuration> |
|
| 3 |
<Appenders> |
|
| 4 |
<!-- Console Appender --> |
|
| 5 |
<Console name="Console" target="SYSTEM_OUT"> |
|
| 6 |
<PatternLayout pattern="%d{yyyy-MMM-dd HH:mm:ss a} [%t] %-5level %logger{36} - %msg%n" />
|
|
| 7 |
</Console> |
|
| 8 |
</Appenders> |
|
| 9 |
<Loggers> |
|
| 10 |
<!-- Log SQL statements --> |
|
| 11 |
<Logger name="org.hibernate.SQL" level="debug" additivity="false"> |
|
| 12 |
<AppenderRef ref="Console" /> |
|
| 13 |
</Logger> |
|
| 14 |
<!-- Log cache --> |
|
| 15 |
<Logger name="org.hibernate.cache" level="debug" additivity="false"> |
|
| 16 |
<AppenderRef ref="Console" /> |
|
| 17 |
</Logger> |
|
| 18 |
<Logger name="org.ehcache" level="debug" additivity="false"> |
|
| 19 |
<AppenderRef ref="Console" /> |
|
| 20 |
</Logger> |
|
| 21 |
<Root level="error"> |
|
| 22 |
<AppenderRef ref="Console" /> |
|
| 23 |
</Root> |
|
| 24 |
</Loggers> |
|
| 25 |
</Configuration> |
|
| modules/uoa-goldoa-service/branches/hibernate/src/main/resources/eu/dnetlib/goldoa/service/hibernate.cfg.xml | ||
|---|---|---|
| 9 | 9 |
<session-factory> |
| 10 | 10 |
<property name="hibernate.hbm2ddl.auto">update</property> |
| 11 | 11 |
<property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL9Dialect</property> |
| 12 |
<property name="show_sql">true</property>
|
|
| 12 |
<property name="show_sql">false</property>
|
|
| 13 | 13 |
<property name="connection.pool_size">1</property> |
| 14 |
<!--<property name="org.hibernate.cache">true</property>--> |
|
| 15 | 14 |
<property name="format_sql">true</property> |
| 16 | 15 |
<!-- enable second level cache and query cache --> |
| 17 |
<!--<property name="hibernate.cache.region.factory_class">org.hibernate.cache.ehcache.EhCacheRegionFactory</property>-->
|
|
| 18 |
<!--<property name="hibernate.cache.use_second_level_cache">true</property>-->
|
|
| 19 |
<!--<property name="hibernate.cache.use_query_cache">true</property>-->
|
|
| 20 |
<!--<property name="net.sf.ehcache.configurationResourceName">ehcache.xml</property>-->
|
|
| 16 |
<!-- <property name="hibernate.cache.use_second_level_cache">true</property>
|
|
| 17 |
<property name="hibernate.cache.region.factory_class">org.hibernate.cache.jcache.JCacheRegionFactory</property>
|
|
| 18 |
<property name="hibernate.javax.cache.provider">org.ehcache.jsr107.EhcacheCachingProvider</property>
|
|
| 19 |
<property name="hibernate.cache.use_query_cache">true</property>-->
|
|
| 21 | 20 |
|
| 21 |
|
|
| 22 | 22 |
<mapping class = "eu.dnetlib.goldoa.domain.User"/> |
| 23 | 23 |
<mapping class = "eu.dnetlib.goldoa.domain.Role"/> |
| 24 | 24 |
<mapping class = "eu.dnetlib.goldoa.domain.UserRole"/> |
| modules/uoa-goldoa-service/branches/hibernate/src/main/resources/log4j.properties | ||
|---|---|---|
| 32 | 32 |
# Define the layout for file appender |
| 33 | 33 |
log4j.appender.FILE.layout=org.apache.log4j.PatternLayout |
| 34 | 34 |
log4j.appender.FILE.layout.conversionPattern=%m%n |
| 35 |
|
|
Also available in: Unified diff
Cache changes