/ - Diff - D-Net - D-Net project tracking tool

     	<bean id="executorService" class="java.util.concurrent.Executors" factory-method="newCachedThreadPool" destroy-method="shutdown" />
     	<context:annotation-config/>
     	<context:property-placeholder location="classpath:applicationContext-goldoa-service.properties" />
     	<!--<context:property-placeholder location="classpath:applicationContext-goldoa-service.properties" />-->
     	<context:component-scan base-package="eu.dnetlib.goldoa.service" />
     	<context:component-scan base-package="eu.dnetlib.goldoa.service.utils" />

     	/*private void loadCommentPersons(RequestInfo requestInfo) throws PersonManagerException {
     		for (Comment comment : requestInfo.getComments()) {
     			comment.setPerson(personManager.getById(comment.getPerson().getId()));
     			comment.setPerson(personManager.getById(comment.getUser().getId()));
+    		}
     	}*/

+        }
         public void saveUser(final User user) {
             //TO DO ! Roles already in db
             for (UserRole ur : user.getRoles()) {
             //TODO ! Roles already in db
             /*for (UserRole ur : user.getRoles()) {
                 Role r = ur.getPk().getRole();
                 getSession().persist(r);
+            }
             }*/
             persist(user);
+        }

     		if (publication.getAuthors() != null) {
     			for (Affiliation affiliation : publication.getAuthors()) {
     				if (jdbcTemplate.update(UPDATE_PUBLICATION_AFFILIATIONS, new String[]{affiliation.getPerson().getId(), affiliation.getOrganization() != null ? affiliation.getOrganization().getId() : null, publication.getId()}, new int[]{Types.VARCHAR, Types.VARCHAR, Types.VARCHAR}) == 0) {
     				if (jdbcTemplate.update(UPDATE_PUBLICATION_AFFILIATIONS, new String[]{affiliation.getUser().getId(), affiliation.getOrganization() != null ? affiliation.getOrganization().getId() : null, publication.getId()}, new int[]{Types.VARCHAR, Types.VARCHAR, Types.VARCHAR}) == 0) {
     					jdbcTemplate.update(INSERT_PUBLICATION_AFFILIATIONS,
     							new Object[]{UserManagerImpl.generateId(affiliation), affiliation.getPerson().getId(), affiliation.getOrganization() != null ? affiliation.getOrganization().getId() : null, affiliation.getStart(), affiliation.getEnd(), affiliation.getDepartment(), publication.getId()},
     							new Object[]{UserManagerImpl.generateId(affiliation), affiliation.getUser().getId(), affiliation.getOrganization() != null ? affiliation.getOrganization().getId() : null, affiliation.getStart(), affiliation.getEnd(), affiliation.getDepartment(), publication.getId()},
     							new int[]{Types.INTEGER, Types.VARCHAR, Types.VARCHAR, Types.TIMESTAMP, Types.TIMESTAMP, Types.VARCHAR, Types.VARCHAR});
+    				}
+    			}

     				if (aff.getOrganization() != null && aff.getOrganization().getId() == null)
     					aff.getOrganization().setId(organizationManager.saveOrganization(aff.getOrganization()));
     				if (aff.getPerson() != null) {
     					String personId = personManager.generateId(aff.getPerson());
     				if (aff.getUser() != null) {
     					String personId = personManager.generateId(aff.getUser());
     					try {
     						boolean affiliationExists = false;
-...
     							affiliations.add(aff);
     							aff.getPerson().setAffiliations(affiliations);
     							aff.getUser().setAffiliations(affiliations);
     							personManager.saveUser(aff.getPerson());
     							personManager.saveUser(aff.getUser());
+    						}
+    					}
+    				}

     			@Override
     			public void run() {
     				/*User user = userDAO.getUserByEmail(email);
     				Role role = userDAO.getRole(roleId);
     				Role role = getRole(roleId);
     				List<User> moderators = getModerators();
     				try {
-...
     	public void setTokenTTL(int tokenTTL) {
     		this.tokenTTL = tokenTTL;
+    	}
     	@Override
     	public Role getRole(String roleId){
     		return userDAO.getRole(roleId);
+    	}
+    }

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/service/UserManager.java
50	50	String generateId(User user);
51	51
52	52	public List<User> getAccountingOfficers();
	53
	54	public Role getRole(String roleId);
53	55	}

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Comment.java
74	74	this.id = id;
75	75	}
76	76
77		public User getPerson() {
	77	public User getUser() {
78	78	return this.user;
79	79	}
80	80

     	@Convert( converter=CurrencyConverter.class )
     	private Currency apccurrency = Currency.EUR;
     	@OneToOne
         @JoinColumn(name = "publisher")
     	private Publisher publisher;

     	@OneToOne
     	@JoinColumn(name="organization")
     	private Organization organization;
     	//@Column(columnDefinition = "text")
     	@Column(columnDefinition = "text")
     	private String department;
     	private Timestamp enddate;
     	private Timestamp startdate;

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Role.java
26	26	this.setRole(role);
27	27	}
28	28
	29	public Role(String id) {
	30	this.id = id;
	31	}
29	32
	33
30	34	public List<UserRole> getUserRoles() {
31	35	return userRoles;
32	36	}

     	private String lastname;
     	@Column(columnDefinition = "text")
     	private String initial;
     	private String initials;
     	@Column(columnDefinition = "text")
     	private String email;
-...
     		this.lastname = lastname;
+    	}
     	public String getInitial() {
     		return initial;
     	public String getInitials() {
     		return initials;
+    	}
     	public void setInitial(String initial) {
     		this.initial = initial;
     	public void setInitials(String initials) {
     		this.initials = initials;
+    	}
     	public String getEmail() {

modules/uoa-goldoa-service/branches/hibernate/src/main/java/eu/dnetlib/goldoa/domain/Country.java
21	21	public Country() {
22	22	}
23	23
	24	public Country(String id){
	25	this.id = id;
	26	}
	27
24	28	public String getId() {
25	29	return this.id;
26	30	}

     	private Float projectparticipation;
     	private Timestamp submissiondate;
     	private Float transferCost;
     	//@Column(name="publisher_email",columnDefinition = "text")
     	//private String publisherEmail;
     	@Column(name="publisher_email",columnDefinition = "text")
     	private String publisherEmail;
     	@Transient
     	private Eligibility eligibility;
-...
     	public void setEligibility(Eligibility eligibility) {
     		this.eligibility = eligibility;
+    	}
     	public String getPublisherEmail() {
     		return publisherEmail;
+    	}
     	public void setPublisherEmail(String publisherEmail) {
     		this.publisherEmail = publisherEmail;
+    	}
+    }

modules/uoa-goldoa-service/branches/hibernate/src/main/resources/eu/dnetlib/goldoa/service/applicationContext-goldoa-service.properties
1	1	goldoa.db.driverClassName = org.postgresql.Driver
2		goldoa.db.url = jdbc:postgresql://194.177.192.221:5432/goldoa
	2
	3	goldoa.db.url = jdbc:postgresql://194.177.192.119:5432/goldoa-test-1
3	4	goldoa.db.username = dnet
4	5	goldoa.db.department = dnetPwd
5	6

     <?xml version="1.0" encoding="UTF-8"?>
     <beans xmlns="http://www.springframework.org/schema/beans"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://www.springframework.org/schema/beans
     http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
     	<!--<bean id="goldoa.dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
        		<property name="driverClassName" value="org.hsqldb.jdbcDriver" />
           	<property name="url" value="jdbc:hsqldb:mem:testDB"/>
           	<property name="username" value="SA" />
           	<property name="department" value="" />
        	</bean>
     -->
     	<!--<bean id="goldoa.dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
     		<property name="driverClassName" value="${goldoa.db.driverClassName}" />
     		<property name="url" value="${goldoa.db.url}" />
     		<property name="username" value="${goldoa.db.username}" />
     		<property name="password" value="${goldoa.db.password}" />
        	</bean>-->
     	<bean id="goldoa.dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
     		<property name="driverClassName" value="${goldoa.db.driverClassName}" />
     		<property name="url" value="${goldoa.db.url}" />
     		<property name="username" value="${goldoa.db.username}" />
     		<property name="department" value="${goldoa.db.department}" />
     		<property name="maxIdle" value="10" />
     		<property name="maxActive" value="100" />
     		<property name="maxWait" value="10000" />
     		<property name="validationQuery" value="SELECT 1;" />
     		<property name="testOnBorrow" value="true" />
     		<property name="testOnReturn" value="true" />
     		<property name="testWhileIdle" value="true" />
     		<property name="timeBetweenEvictionRunsMillis" value="1200000" />
     		<property name="minEvictableIdleTimeMillis" value="1800000" />
     		<property name="numTestsPerEvictionRun" value="5" />
     		<property name="poolPreparedStatements" value="true" />
     		<property name="defaultAutoCommit" value="true" />
     	</bean>
     	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
     	    <property name="dataSource" ref="goldoa.dataSource" />
         	<property name="configLocation" value="classpath:hibernate-cfg.xml" />
         </bean>
     </beans>

     <?xml version="1.0" encoding="UTF-8"?>
     <!DOCTYPE hibernate-configuration PUBLIC
             "-//Hibernate/Hibernate Configuration DTD 3.0//EN"
             "http://hibernate.sourceforge.net/hibernate-configuration-3.0.dtd">
     <hibernate-configuration>
         <session-factory>
             <property name="hibernate.dialect">org.hibernate.dialect.PostgreSQL9Dialect</property>
             <property name="hibernate.hbm2ddl.auto">create</property>
             <property name="show_sql">true</property>
            	<property name="connection.pool_size">1</property>
          	<property name="format_sql">true</property>
         	<property name="cache.provider_class">org.hibernate.cache.NoCacheProvider</property>
            	<mapping class = "eu.dnetlib.goldoa.domain.User"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Role"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.UserRole"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.UserRolePK"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Organization"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Affiliation"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Country"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.File"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Funder"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Help"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Invoice"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Publisher"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Journal"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Language"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.JournalDiscount"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.JournalDiscountPK"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Budget"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Budgetfile"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Comment"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.CommentTemplate"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Project"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.PublisherDiscount"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.PublisherDiscountPK"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.AccountAction"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Request"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Publication"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.RequestCoFunder"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.RequestCoFunderPK"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.RequestComment"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Identifier"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.Author"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.BankAccount"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.BankTransferReceipt"/>
     		<mapping class = "eu.dnetlib.goldoa.domain.BudgetContract"/>
         </session-factory>
     </hibernate-configuration>

Project

General

Profile

D-Net

Revision 46066

Added by Panagiotis Kanakakis over 7 years ago