Project

General

Profile

« Previous | Next » 

Revision 54129

Added by Sandro La Bruzzo over 5 years ago

renamed parameter

View differences:

modules/dnet-msro-service/trunk/src/main/java/eu/dnetlib/msro/workflows/nodes/collect/DateRangeCollectRecordsJobNode.java
29 29 
	private String eprParam;
30 30 
	private String fromDateParam;
31 31 
	private String untilDateParam;
32 
	private String from;
33 
	private String until;
32 
	private String overrideFrom;
33 
	private String overrideUntil;
34 34 

  		




  35
  35
  
    
	@Override


  		




  36
  36
  
    
	protected String execute(final NodeToken token) throws Exception {


  		




  37
  37
  
    
		final String profile = serviceLocator.getService(ISLookUpService.class).getResourceProfile(datasourceId);


  		




  38
  38
  
    
		final Document doc = new SAXReader().read(new StringReader(profile));


  		




  39
  39
  
    
		final Node ifcNode = doc.selectSingleNode("//INTERFACE[@id='" + datasourceInterface + "']");


  		




  40
  
  
    
		final String fromDate = StringUtils.isNoneBlank(from) ? from : token.getEnv().getAttribute(getFromDateParam());


  		




  41
  
  
    
		final String untilDate = StringUtils.isNoneBlank(until) ? until :token.getEnv().getAttribute(getUntilDateParam());


  		




  
  40
  
    
		final String fromDate = StringUtils.isNoneBlank(overrideFrom) ? overrideFrom : token.getEnv().getAttribute(getFromDateParam());


  		




  
  41
  
    
		final String untilDate = StringUtils.isNoneBlank(overrideUntil) ? overrideUntil :token.getEnv().getAttribute(getUntilDateParam());


  		




  42
  42
  
    

  		




  43
  43
  
    
		final InterfaceDescriptor interfaceDescriptor = InterfaceDescriptor.newInstance(ifcNode);


  		




  44
  44
  
    

  		




  ......




  89
  89
  
    
		this.eprParam = eprParam;


  		




  90
  90
  
    
	}


  		




  91
  91
  
    

  		




  92
  
  
    
	public String getFrom() {


  		




  93
  
  
    
		return from;


  		




  
  92
  
    
	public String getOverrideFrom() {


  		




  
  93
  
    
		return overrideFrom;


  		




  94
  94
  
    
	}


  		




  95
  95
  
    

  		




  96
  
  
    
	public void setFrom(String from) {


  		




  97
  
  
    
		this.from = from;


  		




  
  96
  
    
	public void setOverrideFrom(String overrideFrom) {


  		




  
  97
  
    
		this.overrideFrom = overrideFrom;


  		




  98
  98
  
    
	}


  		




  99
  99
  
    

  		




  100
  
  
    
	public String getUntil() {


  		




  101
  
  
    
		return until;


  		




  
  100
  
    
	public String getOverrideUntil() {


  		




  
  101
  
    
		return overrideUntil;


  		




  102
  102
  
    
	}


  		




  103
  103
  
    

  		




  104
  
  
    
	public void setUntil(String until) {


  		




  105
  
  
    
		this.until = until;


  		




  
  104
  
    
	public void setOverrideUntil(String overrideUntil) {


  		




  
  105
  
    
		this.overrideUntil = overrideUntil;


  		




  106
  106
  
    
	}


  		




  107
  107
  
    
}


  		












  

    
      modules/dnet-msro-service/trunk/src/main/resources/eu/dnetlib/msro/service/applicationContext-msro-service.properties
    
  





  11
  11
  
    
msro.wf.mail.thread.startDelay = 60000


  		




  12
  12
  
    
msro.wf.mail.thread.repeatInterval = 60000


  		




  13
  13
  
    

  		




  14
  
  
    
msro.wf.mail.from = dnet-noreply@research-infrastructures.eu


  		




  
  14
  
    
msro.wf.mail.overrideFrom = dnet-noreply@research-infrastructures.eu


  		




  15
  15
  
    
msro.wf.mail.fromName = D-NET Workflow Manager


  		




  16
  16
  
    
msro.wf.mail.cc = michele.artini@isti.cnr.it


  		




  17
  17
  
    
msro.wf.mail.smtp.host = localhost


  		












  

    
      modules/dnet-msro-service/trunk/src/main/resources/eu/dnetlib/msro/service/applicationContext-msro-service.xml
    
  





  125
  125
  
    
		p:name="${msro.wf.logger.name}" p:indexConf="${msro.wf.logger.index.conf}" />


  		




  126
  126
  
    
	


  		




  127
  127
  
    
	<bean id="msroMailDispatcher" class="eu.dnetlib.msro.notification.EmailDispatcher"


  		




  128
  
  
    
		p:from="${msro.wf.mail.from}" p:fromName="${msro.wf.mail.fromName}" p:cc="${msro.wf.mail.cc}"


  		




  
  128
  
    
		p:overrideFrom="${msro.wf.mail.overrideFrom}" p:fromName="${msro.wf.mail.fromName}" p:cc="${msro.wf.mail.cc}"


  		




  129
  129
  
    
		p:smtpHost="${msro.wf.mail.smtp.host}" p:smtpPort="${msro.wf.mail.smtp.port}" p:smtpUser="${msro.wf.mail.smtp.user}" p:smtpPassword="${msro.wf.mail.smtp.password}" 


  		




  130
  130
  
    
		p:baseUrl="${msro.wf.mail.message.baseUrl}" p:infrastructure="${msro.wf.mail.message.infrastructure}"/>


  		




  131
  131
  
    
	


  		












Also available in:  Unified diff