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

+    {
       "type_source": "SVN",
       "goal": "package -U -T 4C source:jar",
       "url": "http://svn-public.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-commons/trunk",
       "deploy_repository": "dnet4-snapshots",
       "url": "http://svn-public.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-commons/trunk",
       "deploy_repository": "dnet45-snapshots",
       "version": "4",
       "mail": "antleb@di.uoa.gr, kiatrop@di.uoa.gr",
       "deploy_repository_url": "http://maven.research-infrastructures.eu/nexus/content/repositories/dnet4-snapshots",
       "deploy_repository_url": "http://maven.research-infrastructures.eu/nexus/content/repositories/dnet45-snapshots",
       "name": "uoa-commons"
+    }
+    }

     import javax.xml.bind.JAXBException;
     import junit.framework.Assert;
     import org.junit.Assert;
     import org.junit.Test;
     import eu.dnetlib.domain.enabling.Vocabulary;

     	List<String> fetch(String XQuery) throws ISLookUpException;
     	/**
     	 * Performs a search by criteria.
+    	 *
     	 * @param criteria the search criteria.
     	 * @return An EPR poiting to a result set with the results.
     	 * @throws ISLookUpException
     	 */
     	EPR search(SearchCriteria criteria) throws ISLookUpException;
     	/**
     	 * Performs a direct XQuery search and returns a list of xml profiles that
     	 * match the criteria, without any processing.
+    	 *
     	 * @param XQuery the xquery.
     	 * @return An EPR poiting to a result set with the results.
     	 * @throws ISLookUpException
     	 */
     	EPR search(String XQuery) throws ISLookUpException;
     	/**
     	 * Uses the appropriate method in ISLookUp and performs a query without
     	 * using a result set. This method should be used only when a small number
     	 * of results is expected. If there is a large number of results, there is a

     		return list;
+    	}
     	@Override
     	public EPR search(SearchCriteria criteria) throws ISLookUpException {
     		return lookUp.search(criteria);
+    	}
     	@Override
     	public EPR search(String XQuery) throws ISLookUpException {
     		return lookUp.search(XQuery);
+    	}
     	public void setLookUp(ISLookUp<R> lookUp) {
     		this.lookUp = lookUp;
+    	}

     public class CriteriaCacheKey {
     	private SearchCriteria criteria = null;
     	private String XQuery = null;
     	private Mode mode = null;
     	enum Mode {
     		/** Performs quick search */
     		QUICK,
     		/** Performs a normal search, using a result set */
     		RS;
+    	}
     	public CriteriaCacheKey(SearchCriteria criteria, Mode mode) {
     	public CriteriaCacheKey(SearchCriteria criteria) {
     		this.criteria = criteria;
     		this.mode = mode;
+    	}
     	public SearchCriteria getCriteria() {
-...
     		this.criteria = criteria;
+    	}
     	public Mode getMode() {
     		return mode;
+    	}
     	public void setMode(Mode mode) {
     		this.mode = mode;
+    	}
     	public String getXQuery() {
     		return this.XQuery;
+    	}
-...
+    	}
     	@Override
     	public int hashCode() {
     		final int prime = 31;
     		int result = 1;
     		result = prime * result
     				+ ((criteria == null) ? 0 : criteria.hashCode());
     		result = prime * result + ((mode == null) ? 0 : mode.hashCode());
     		return result;
     	public boolean equals(Object o) {
     		if (this == o) return true;
     		if (o == null || getClass() != o.getClass()) return false;
     		CriteriaCacheKey that = (CriteriaCacheKey) o;
     		if (criteria != null ? !criteria.equals(that.criteria) : that.criteria != null) return false;
     		return XQuery != null ? XQuery.equals(that.XQuery) : that.XQuery == null;
+    	}
     	@Override
     	public boolean equals(Object obj) {
     		if (this == obj)
     			return true;
     		if (obj == null)
     			return false;
     		if (getClass() != obj.getClass())
     			return false;
     		CriteriaCacheKey other = (CriteriaCacheKey) obj;
     		if (criteria == null) {
     			if (other.criteria != null)
     				return false;
     		} else if (!criteria.equals(other.criteria))
     			return false;
     		if (mode == null) {
     			if (other.mode != null)
     				return false;
     		} else if (!mode.equals(other.mode))
     			return false;
     		return true;
     	public int hashCode() {
     		int result = criteria != null ? criteria.hashCode() : 0;
     		result = 31 * result + (XQuery != null ? XQuery.hashCode() : 0);
     		return result;
+    	}
+    }

     import org.apache.log4j.Logger;
     import eu.dnetlib.api.enabling.ISLookUpService;
     import eu.dnetlib.api.enabling.ISLookUpServiceException;
     import eu.dnetlib.domain.DriverResource;
     import eu.dnetlib.domain.EPR;
     import eu.dnetlib.domain.SearchCriteria;
     import gr.uoa.di.driver.enabling.ISLookUp;
     import gr.uoa.di.driver.enabling.ISLookUpException;
     import gr.uoa.di.driver.enabling.islookup.cache.CriteriaCacheKey.Mode;
     import gr.uoa.di.driver.util.ServiceLocator;
     import gr.uoa.di.driver.xml.ResourceToXmlConverter;
-...
     			logger.debug("Fetching results for query: " +
     					converter.toXQueryString(criteria));
     		CriteriaCacheKey key = new CriteriaCacheKey(criteria, Mode.RS);
     		CriteriaCacheKey key = new CriteriaCacheKey(criteria);
     		key.setXQuery(converter.toXQueryString(criteria));
     		Element element = criteriaCache.get(key);
-...
     			logger.debug("Performing quick search for query: "
     					+ converter.toXQueryString(criteria));
     		CriteriaCacheKey key = new CriteriaCacheKey(criteria, Mode.QUICK);
     		CriteriaCacheKey key = new CriteriaCacheKey(criteria);
     		key.setXQuery(converter.toXQueryString(criteria));
     		Element element = criteriaCache.get(key);
-...
     			throw new ISLookUpException("More than one results in query");
+    	}
     	@Override
     	public EPR search(SearchCriteria criteria) throws ISLookUpException {
     		if (logger.isDebugEnabled())
     			logger.debug("Performing search for query: " +
     					converter.toXQueryString(criteria));
     		return this.search(converter.toXQueryString(criteria));
+    	}
     	@Override
     	public EPR search(String XQuery) throws ISLookUpException {
     		try {
     			if (logger.isDebugEnabled())
     				logger.debug("Performing search for query: " +
     						XQuery);
     			return lookupLocator.getService().searchProfile(XQuery);
     		} catch (ISLookUpServiceException e) {
     			throw new ISLookUpException(e);
+    		}
+    	}
     	public void setLookupLocator(ServiceLocator<ISLookUpService> lookupLocator) {
     		this.lookupLocator = lookupLocator;
+    	}

     import eu.dnetlib.api.enabling.ISLookUpServiceException;
     import eu.dnetlib.domain.DriverResource;
     import eu.dnetlib.domain.EPR;
     import gr.uoa.di.driver.enabling.islookup.cache.CriteriaCacheKey.Mode;
     import gr.uoa.di.driver.enabling.resultset.ResultSet;
     import gr.uoa.di.driver.enabling.resultset.ResultSetFactory;
     import gr.uoa.di.driver.util.ServiceLocator;
-...
     		} else if (key instanceof CriteriaCacheKey) {
     			CriteriaCacheKey args = (CriteriaCacheKey) key;
     			String XQuery = args.getXQuery();
     			Mode mode = args.getMode();
     			entry = this.getByCriteria(XQuery, mode);
     			entry = this.getByCriteria(XQuery);
     		} else {
     			logger.warn("key is not id or query");
     			logger.warn("key is: " + key + "(" + key.getClass() + ")");
-...
     		return entry;
+    	}
     	private List<String> getByCriteria(String XQuery, Mode mode) throws ISLookUpServiceException {
     		List<String> res = null;
     		switch (mode) {
     		case RS:
     			logger.debug("Mode is 'RS'. Performing normal search");
     			EPR epr = lookUpServiceLocator.getService().searchProfile(XQuery);
     			ResultSet<String> rs = rsFactory.createResultSet(epr);
     			if (rs.size() > 0)
     				res = rs.get(1, rs.size());
     			else
     				res = Collections.emptyList();
     			break;
     		case QUICK:
     			logger.debug("Mode is 'QUICK'. Performing quick search");
     			res = lookUpServiceLocator.getService().quickSearchProfile(XQuery);
     			break;
+    		}
     		return res;
     	private List<String> getByCriteria(String XQuery) throws ISLookUpServiceException {
     				return lookUpServiceLocator.getService().quickSearchProfile(XQuery);
+    	}
     	private String getById(String key) throws ISLookUpServiceException {

     		return map;
+    	}
     	@Override
     	public EPR search(SearchCriteria criteria) throws ISLookUpException {
     		return lookup.search(criteria);
+    	}
     	@Override
     	public EPR search(String XQuery) throws ISLookUpException {
     		return lookup.search(XQuery);
+    	}
     	public CachingISLookUp<D> getLookup() {
     		return lookup;
+    	}

     import eu.dnetlib.api.enabling.ISLookUpService;
     import eu.dnetlib.api.enabling.ISLookUpServiceException;
     import eu.dnetlib.domain.DriverResource;
     import eu.dnetlib.domain.EPR;
     import eu.dnetlib.domain.SearchCriteria;
     import gr.uoa.di.driver.enabling.ISLookUp;
     import gr.uoa.di.driver.enabling.ISLookUpException;
     import gr.uoa.di.driver.enabling.resultset.ResultSet;
     import gr.uoa.di.driver.enabling.resultset.ResultSetFactory;
     import gr.uoa.di.driver.util.ServiceLocator;
     import gr.uoa.di.driver.xml.ResourceToXmlConverter;
-...
     	private ServiceLocator<ISLookUpService> lookupLocator = null;
     	private ResourceToXmlConverter<D> converter = null;
     	private ResultSetFactory rsFactory = null;
     	public D getById(String profileId) throws ISLookUpException {
     		try {
-...
     			String xQuery = converter.toXQueryString(criteria);
     			logger.debug("xQuery: " + xQuery);
     			EPR epr = lookupLocator.getService().searchProfile(xQuery);
     			ResultSet<String> xmls = rsFactory.createResultSet(epr);
     			List<String> xmls = lookupLocator.getService().quickSearchProfile(xQuery);
     			List<D> res = new ArrayList<D>();
     			logger.debug("Getting results from result set. Result set size: "
-...
     			logger.debug("starting parsing");
     			if (xmls.size() > 0) {
     				for (String xml : xmls.get(1, xmls.size()))
     				for (String xml : xmls)
     					res.add(this.parseXmlProfile(xml));
+    			}
     			logger.debug("parsed");
     			return res;
-...
+    	}
     	public List<String> fetch(String XQuery) throws ISLookUpException {
     		ResultSet<String> rs;
     		try {
     			rs = rsFactory.createResultSet(lookupLocator.getService().searchProfile(
     					XQuery));
     			if (rs.size() > 0)
     				return rs.get(1, rs.size());
     			else
     				return new ArrayList<String>();
     			return lookupLocator.getService().quickSearchProfile(XQuery);
     		} catch (ISLookUpServiceException e) {
     			throw new ISLookUpException(e);
+    		}
-...
     			throw new ISLookUpException("More than one results in query");
+    	}
     	@Override
     	public EPR search(SearchCriteria criteria) throws ISLookUpException {
     		try {
     			return lookupLocator.getService().searchProfile(
     					converter.toXQueryString(criteria));
     		} catch (ISLookUpServiceException e) {
     			throw new ISLookUpException(e);
+    		}
+    	}
     	@Override
     	public EPR search(String XQuery) throws ISLookUpException {
     		try {
     			return lookupLocator.getService().searchProfile(XQuery);
     		} catch (ISLookUpServiceException e) {
     			throw new ISLookUpException(e);
+    		}
+    	}
     	public void setLookupLocator(ServiceLocator<ISLookUpService> lookupLocator) {
     		this.lookupLocator = lookupLocator;
+    	}
-...
     	public void setConverter(ResourceToXmlConverter<D> converter) {
     		this.converter = converter;
+    	}
     	public void setRsFactory(ResultSetFactory rsFactory) {
     		this.rsFactory = rsFactory;
+    	}
+    }

     		lookup.setConverter(new SecurityProfileXmlConverter());
     		lookup.setLookupLocator(lookupLocator);
     		lookup.setRsFactory(rsFactory);
     		lookUpMap.put(SecurityProfile.class, lookup);
+    	}
-...
     				((ISLookUpImpl<D>) lookup).setConverter(this.getConverter(resourceClass));
     				((ISLookUpImpl<D>) lookup).setLookupLocator(lookupLocator);
     				((ISLookUpImpl<D>) lookup).setRsFactory(this.rsFactory);
     				if (SecureDriverResource.class.isAssignableFrom(resourceClass)) {
     					SecurityAwareLookupImpl<SecureDriverResource> secureLookup = new SecurityAwareLookupImpl<SecureDriverResource>();

     import javax.xml.ws.Endpoint;
     import eu.dnetlib.enabling.is.registry.rmi.ISRegistryService;
     import org.apache.log4j.Logger;
     import eu.dnetlib.domain.EPR;
-...
     			if (removeRegistration) {
     				logger.debug("Removing service registration");
     				this.getRegistrator().getRegistryLocator().getService()
     				this.getRegistrator().getServiceLocator().getService(ISRegistryService.class)
     						.deleteProfile(this.getProfileId());
+    			}
     		} catch (ISRegistryException e) {

     <beans xmlns="http://www.springframework.org/schema/beans"
            xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xmlns:ehcache="http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring"
            xsi:schemaLocation="
     		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
             http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring
             http://ehcache-spring-annotations.googlecode.com/svn/schema/ehcache-spring/ehcache-spring-1.1.xsd"
            xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"
            default-autowire="no">
     	<!-- the nkua registry wrappers -->
-...
     <!--					<entry key="eu.dnetlib.domain.functionality.WebInterfaceLayout" value="gr.uoa.di.driver.xml.WebInterfaceLayoutXmlConverter" />-->
     				</map>
     		</property>
     		<property name="endpointResolver" ref="serviceResolver" />
     		<property name="endpointResolver" ref="endpointResolver" />
     		<property name="securityLookUp" ref="securityLookUp" />
     	</bean>

     <?xml version="1.0" encoding="UTF-8"?>
     <beans xmlns="http://www.springframework.org/schema/beans"
     	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
     	xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws"
     	xmlns:p="http://http://www.springframework.org/schema/p"
     	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-4.0.xsd
             http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
             http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
             http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"
                     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"
     	default-autowire="no" default-lazy-init="false">
     	<!--
-...
     			 <constructor-arg index="0" value="PENDING" />
     			 </bean>
     		</property>
     		<property name="rsFactory" ref="resultSetFactory" />
     		<property name="lookupLocator" ref="lookupServiceLocator" />
     	</bean>
-...
     			<bean class="gr.uoa.di.driver.xml.SecurityProfileXmlConverter" />
     		</property>
     		<property name="lookupLocator" ref="lookupServiceLocator" />
     		<property name="rsFactory" ref="resultSetFactory" />
     	</bean>
     	<bean id="userLookUp" factory-bean="lookUpFactory"

     <?xml version="1.0" encoding="UTF-8"?>
     <beans xmlns="http://www.springframework.org/schema/beans"
     	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
     	xmlns:cxf="http://cxf.apache.org/core" xmlns:jaxws="http://cxf.apache.org/jaxws"
     	xmlns:p="http://http://www.springframework.org/schema/p"
     	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-4.0.xsd
             http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
             http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
             http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd"
                     http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"
     	default-autowire="no" default-lazy-init="false">
     	<bean id="cacheManager" class="net.sf.ehcache.CacheManager" />

     <beans xmlns="http://www.springframework.org/schema/beans"
     	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
     	xmlns:t="http://dnetlib.eu/springbeans/t" xmlns:template="http://dnetlib.eu/springbeans/template"
     	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
     		http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd"
     		default-autowire="no">
-...
     	<!-- service registrator -->
     	<bean id="serviceRegistrator"
     		class="eu.dnetlib.enabling.tools.registration.ServiceRegistrator"
     		p:registryLocator-ref="cnr.registryLocator" p:lookupLocator-ref="cnr.lookUpLocator"
     		  p:serviceLocator-ref="cnr.uniqueServiceLocator"
     		p:serviceNameResolver-ref="serviceNameResolver"
     		p:eprBuilder-ref="jaxwsEndpointReferenceBuilder" p:hnmLocator-ref="${services.registration.default.hnmlocator}" />
     	<bean id="dynamicHNMLocator" class="eu.dnetlib.enabling.tools.DynamicHNMLocator"
     		p:lookupLocator-ref="cnr.lookUpLocator" />
     		  p:serviceLocator-ref="cnr.uniqueServiceLocator" />
     	<bean id="nullHNMLocator" class="eu.dnetlib.enabling.tools.NullHNMLocator" />
-...
     			destroy-method="destroy"
     			p:service-ref="$service$"
     			p:endpoint-ref="$endpoint$"
     			p:lookupLocator-ref="cnr.lookUpLocator"
     			p:serviceLocator-ref="cnr.uniqueServiceLocator"
     			p:registrator-ref="$serviceRegistrator$"
     			p:eprBuilder-ref="$eprBuilder$"
     			p:removeRegistration="\${services.registration.default.removeRegistration}" />
     		<bean t:id="$name$Trigger"
     			class="org.springframework.scheduling.quartz.SimpleTriggerBean"
     			class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean"
     			p:startDelay="\${services.registration.delay}" p:repeatInterval="4000"
     			p:jobDetail-ref="$name$TriggerDetails" />

     <?xml version="1.0" encoding="UTF-8"?>
     <beans
     	xmlns="http://www.springframework.org/schema/beans"
     	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     	xmlns:p="http://www.springframework.org/schema/p"
     	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     	xmlns:t="http://dnetlib.eu/springbeans/t"
     	xmlns:template="http://dnetlib.eu/springbeans/template"

     <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     	<parent>
     		<groupId>eu.dnetlib</groupId>
     		<artifactId>dnet-parent</artifactId>
     		<artifactId>dnet45-parent</artifactId>
     		<version>1.0.0-SNAPSHOT</version>
     	</parent>
     	<modelVersion>4.0.0</modelVersion>
     	<groupId>eu.dnetlib</groupId>
     	<artifactId>uoa-commons</artifactId>
     	<packaging>jar</packaging>
     	<version>1.2.1-SNAPSHOT</version>
     	<version>2.0.0-SNAPSHOT</version>
     	<scm>
     		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-commons/trunk</developerConnection>
     		<developerConnection>scm:svn:https://svn.driver.research-infrastructures.eu/driver/dnet45/modules/uoa-commons/trunk</developerConnection>
     	</scm>
     	<properties>
-...
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>uoa-api</artifactId>
     			<version>[1.2.0, 1.3.0-SNAPSHOT)</version>
     			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
     		</dependency>
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>uoa-domain</artifactId>
     			<version>[1.2.0, 1.3.0-SNAPSHOT)</version>
     			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
     		</dependency>
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>uoa-utils</artifactId>
     			<version>[1.2.0, 1.3.0-SNAPSHOT)</version>
     			<version>[2.0.0-SNAPSHOT, 3.0.0)</version>
     		</dependency>
     		<dependency>
     			<groupId>org.springframework</groupId>
-...
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>cnr-misc-utils</artifactId>
     			<version>[1.0.0]</version>
     			<version>[1.0.4-SNAPSHOT, 2.0.0)</version>
     		</dependency>
     		<dependency>
     			<groupId>eu.dnetlib</groupId>
     			<artifactId>cnr-spring-utils</artifactId>
     			<version>[1.0.0]</version>
     			<version>[1.0.1-SNAPSHOT]</version>
     		</dependency>
     		<dependency>
     			<groupId>commons-dbcp</groupId>

Project

General

Profile

D-Net

Revision 47404

Added by Antonis Lempesis almost 7 years ago