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

modules/dnet-components/trunk/src/main/resources/eu/dnetlib/common/services/locators/applicationContext-locators.properties
1		default.service.comparator = preferLocalRunningInstanceComparator

     <?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:lang="http://www.springframework.org/schema/lang" xmlns:p="http://www.springframework.org/schema/p"
     	xmlns:util="http://www.springframework.org/schema/util"
     	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
     		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
     		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
     		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
     	<bean id="defaultDnetServiceLocator"
     		class="eu.dnetlib.common.services.locators.DefaultDnetServiceLocator"
     		p:defaultComparator-ref="defaultServiceComparator"/>
     	<bean id="preferLocalRunningInstanceComparator"
     		class="eu.dnetlib.common.services.locators.comparators.PreferLocalRunningInstanceComparator" />
     	<alias name="${default.service.comparator}" alias="defaultServiceComparator" />
     </beans>

     		final HibBlackboardMessage hib = dao.find(message.getId());
     		hib.setAction(message.getAction());
     		hib.setDate(message.getDate());
     		hib.setParams(new Gson().toJson(message.getParameters()));
     		hib.setMessage(message.getJsonMessage());
     		hib.setStatus(message.getStatus().toString());
     		dao.save(hib);
+    	}

     import java.io.Serializable;
     import java.util.Date;
     import java.util.Map;
     import javax.persistence.Entity;
     import javax.persistence.Id;
-...
     import org.hibernate.Session;
     import com.google.gson.Gson;
     import com.google.gson.reflect.TypeToken;
     import eu.dnetlib.rmi.objects.is.BlackboardActionStatus;
     import eu.dnetlib.rmi.objects.is.BlackboardMessage;
-...
     	private Date date;
     	private String action;
     	private String status;
     	private String params;
     	private String message;
     	public HibBlackboardMessage() {}
     	public HibBlackboardMessage(final HibService service, final String id, final Date date, final String action, final String status, final String params) {
     	public HibBlackboardMessage(final HibService service, final String id, final Date date, final String action, final String status, final String message) {
     		this.service = service;
     		this.id = id;
     		this.date = date;
     		this.action = action;
     		this.status = status;
     		this.params = params;
     		this.setMessage(message);
+    	}
     	public HibBlackboardMessage(final HibService service, final BlackboardMessage b) {
-...
     		setAction(b.getAction());
     		setDate(b.getDate());
     		setId(b.getId());
     		setParams(new Gson().toJson(b.getParameters()));
     		setMessage(b.getJsonMessage());
     		setService(service);
     		setStatus(b.getStatus().toString());
+    	}
-...
     		this.status = status;
+    	}
     	public String getParams() {
     		return params;
     	public String getMessage() {
     		return message;
+    	}
     	public void setParams(final String params) {
     		this.params = params;
     	public void setMessage(final String message) {
     		this.message = message;
+    	}
     	public BlackboardMessage asDnetBlackboardMessage() {
     		final BlackboardMessage message = new BlackboardMessage();
     		final Map<String, String> mapParams = new Gson().fromJson(params, new TypeToken<Map<String, String>>() {}.getType());
     		message.setId(id);
     		message.setAction(action);
     		message.setStatus(BlackboardActionStatus.valueOf(status));
     		message.setDate(date);
     		message.setParameters(mapParams);
     		return message;
     		final BlackboardMessage bb = new BlackboardMessage();
     		bb.setId(id);
     		bb.setAction(action);
     		bb.setStatus(BlackboardActionStatus.valueOf(status));
     		bb.setDate(date);
     		bb.setJsonMessage(message);
     		return bb;
+    	}
     	@Override
-...
     	public int hashCode() {
     		return id.hashCode();
+    	}
+    }

     	id      varchar(255) NOT NULL PRIMARY KEY,
     	action  varchar(255) NOT NULL,
     	date    timestamp,
     	params  text,
     	message text,
     	status  varchar(255) NOT NULL
     );

     package eu.dnetlib.enabling.annotations;
     import java.lang.annotation.ElementType;
     import java.lang.annotation.Retention;
     import java.lang.annotation.RetentionPolicy;
     import java.lang.annotation.Target;
     import eu.dnetlib.rmi.soap.BaseService;
     @Retention(RetentionPolicy.RUNTIME)
     @Target(ElementType.TYPE)
     public @interface Blackboard {
     	String action();
     	Class<? extends BaseService> serviceClass();
+    }

     package eu.dnetlib.rmi.soap;
     import javax.jws.WebService;
     @WebService(targetNamespace = "http://services.dnetlib.eu/")
     public interface TestService extends BaseService {
+    }

     package eu.dnetlib.rmi.blackboard;
     import eu.dnetlib.enabling.annotations.Blackboard;
     import eu.dnetlib.rmi.soap.TestService;
     @Blackboard(action = "ADD", serviceClass = TestService.class)
     public class SumMessage {
     	private int x = 0;
     	private int y = 0;
     	private int res = 0;
     	public SumMessage() {}
     	public SumMessage(final int x, final int y) {
     		this.x = x;
     		this.y = y;
+    	}
     	public SumMessage(final int x, final int y, final int res) {
     		this.x = x;
     		this.y = y;
     		this.res = res;
+    	}
     	public int getX() {
     		return x;
+    	}
     	public void setX(final int x) {
     		this.x = x;
+    	}
     	public int getY() {
     		return y;
+    	}
     	public void setY(final int y) {
     		this.y = y;
+    	}
     	public int getRes() {
     		return res;
+    	}
     	public void setRes(final int res) {
     		this.res = res;
+    	}
+    }

     package eu.dnetlib.rmi.objects.is;
     import java.util.Date;
     import java.util.Map;
     import javax.xml.bind.annotation.XmlRootElement;
-...
     	private String action;
     	private BlackboardActionStatus status;
     	private Date date;
     	private Map<String, String> parameters;
     	private String jsonMessage;
     	public BlackboardMessage() {}
     	public BlackboardMessage(final String id, final String action, final BlackboardActionStatus status, final Date date, final Map<String, String> parameters) {
     	public BlackboardMessage(final String id, final String action, final BlackboardActionStatus status, final Date date, final String jsonMessage) {
     		this.id = id;
     		this.action = action;
     		this.status = status;
     		this.date = date;
     		this.parameters = parameters;
     		this.jsonMessage = jsonMessage;
+    	}
     	public String getId() {
-...
     		this.date = date;
+    	}
     	public Map<String, String> getParameters() {
     		return parameters;
     	public String getJsonMessage() {
     		return jsonMessage;
+    	}
     	public void setParameters(final Map<String, String> parameters) {
     		this.parameters = parameters;
     	public void setJsonMessage(final String jsonMessage) {
     		this.jsonMessage = jsonMessage;
+    	}
     	@Override
     	public int hashCode() {
     		return id.hashCode();
+    	}
+    }

     public class ServiceNameResolver {
     	public static String resolveServiceName(final Class<? extends BaseService> clazz) {
     		for (Class<?> ifc : clazz.getInterfaces()) {
     			if (ifc.getAnnotation(WebService.class) != null) { return ifc.getSimpleName(); }
     		if (clazz.isInterface() && clazz.isAnnotationPresent(WebService.class)) {
     			return clazz.getSimpleName();
     		} else {
     			for (Class<?> ifc : clazz.getInterfaces()) {
     				if (ifc.isAnnotationPresent(WebService.class)) { return ifc.getSimpleName(); }
+    			}
     			for (Class<?> ifc : clazz.getInterfaces()) {
     				if (BaseService.class.isAssignableFrom(ifc)) { return ifc.getSimpleName(); }
+    			}
+    		}
     		for (Class<?> ifc : clazz.getInterfaces()) {
     			if (BaseService.class.isAssignableFrom(ifc)) { return ifc.getSimpleName(); }
+    		}
     		return clazz.getSimpleName();
+    	}
+    }

     package eu.dnetlib.common.blackboard;
     import java.util.Date;
     import java.util.UUID;
     import java.util.concurrent.Callable;
     import javax.annotation.Resource;
     import org.apache.commons.logging.Log;
     import org.apache.commons.logging.LogFactory;
     import com.google.gson.Gson;
     import eu.dnetlib.common.services.locators.DnetServiceLocator;
     import eu.dnetlib.enabling.annotations.Blackboard;
     import eu.dnetlib.rmi.objects.is.BlackboardActionStatus;
     import eu.dnetlib.rmi.objects.is.BlackboardMessage;
     import eu.dnetlib.rmi.soap.BaseService;
     import eu.dnetlib.rmi.soap.InformationService;
     import eu.dnetlib.rmi.soap.exceptions.InformationServiceException;
     public class BlackboardDispatcher {
     	@Resource
     	private DnetServiceLocator serviceLocator;
     	private static final Log log = LogFactory.getLog(BlackboardDispatcher.class);
     	public <T> void createDispatcher(final T message, final Callable<T> onSuccess, final Callable<T> onFail, final Callable<T> onOngoing)
     			throws InformationServiceException {
     		if (message != null && message.getClass().isAnnotationPresent(Blackboard.class)) {
     			final Blackboard annotation = message.getClass().getAnnotation(Blackboard.class);
     			final Class<? extends BaseService> serviceClass = annotation.serviceClass();
     			log.info("**** " + serviceClass);
     			final String serviceId = serviceLocator.getServiceId(serviceClass);
     			log.info("**** " + serviceId);
     			serviceLocator.getService(InformationService.class).addBlackBoardMessage(serviceId, asSoapMessage(annotation.action(), message));
     		} else if (message != null) {
     			log.error("Missing BlackboardMessage annotation, class: " + message.getClass());
     		} else {
     			log.error("Message is null");
+    		}
+    	}
     	private BlackboardMessage asSoapMessage(final String action, final Object message) {
     		final BlackboardMessage bb = new BlackboardMessage();
     		bb.setAction(action);
     		bb.setDate(new Date());
     		bb.setId("bb-" + UUID.randomUUID());
     		bb.setStatus(BlackboardActionStatus.ASSIGNED);
     		bb.setJsonMessage(new Gson().toJson(message));
     		return bb;
+    	}
+    }

modules/dnet-components/trunk/src/main/resources/eu/dnetlib/common/applicationContext-common.properties
	1	default.service.comparator = preferLocalRunningInstanceComparator

     <?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:lang="http://www.springframework.org/schema/lang" xmlns:p="http://www.springframework.org/schema/p"
     	xmlns:util="http://www.springframework.org/schema/util"
     	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
     		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
     		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd
     		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
     	<bean id="defaultDnetServiceLocator"
     		class="eu.dnetlib.common.services.locators.DefaultDnetServiceLocator"
     		p:defaultComparator-ref="defaultServiceComparator"/>
     	<bean id="preferLocalRunningInstanceComparator"
     		class="eu.dnetlib.common.services.locators.comparators.PreferLocalRunningInstanceComparator" />
     	<alias name="${default.service.comparator}" alias="defaultServiceComparator" />
     	<bean id="blackboardDispatche" class="eu.dnetlib.common.blackboard.BlackboardDispatcher" />
     </beans>

     	</configSuffixes>
     	<enableImports><![CDATA[false]]></enableImports>
     	<configs>
     		<config>src/main/resources/eu/dnetlib/common/services/locators/applicationContext-locators.xml</config>
     		<config>src/main/resources/eu/dnetlib/common/applicationContext-common.xml</config>
     	</configs>
     	<autoconfigs>
     	</autoconfigs>

     package eu.dnetlib.enabling.test;
     import eu.dnetlib.common.services.AbstractBaseService;
     import eu.dnetlib.rmi.soap.TestService;
     public class TestServiceImpl extends AbstractBaseService implements TestService {
+    }

     package eu.dnetlib.enabling.test;
     import javax.annotation.Resource;
     import org.springframework.stereotype.Controller;
     import org.springframework.web.bind.annotation.RequestMapping;
     import org.springframework.web.bind.annotation.RequestParam;
     import org.springframework.web.bind.annotation.ResponseBody;
     import eu.dnetlib.common.blackboard.BlackboardDispatcher;
     import eu.dnetlib.rmi.blackboard.SumMessage;
     import eu.dnetlib.rmi.soap.exceptions.InformationServiceException;
     @Controller
     public class TestController {
     	@Resource
     	private BlackboardDispatcher blackboardDispatcher;
     	@RequestMapping("/sum")
     	public @ResponseBody
     	String sum(@RequestParam(value = "x", required = true) final int x, @RequestParam(value = "y", required = true) final int y)
     			throws InformationServiceException {
     		blackboardDispatcher.createDispatcher(new SumMessage(x, y), null, null, null);
     		return String.format("%d + %d = %d", x, y, x + y);
+    	}
+    }

modules/dnet-core-services/trunk/src/main/java/eu/dnetlib/enabling/node/NodeManagerServiceImpl.java
11	11	public String echo(final String message) {
12	12	return Joiner.on(", ").join(message, message, message);
13	13	}
	14
14	15	}

     <?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:jaxws="http://cxf.apache.org/jaxws"
     	xmlns:sec="http://cxf.apache.org/configuration/security" xmlns:wsa="http://cxf.apache.org/ws/addressing"
     	xmlns:p="http://www.springframework.org/schema/p" xmlns:http="http://cxf.apache.org/transports/http/configuration"
     	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://cxf.apache.org/ws/addressing http://cxf.apache.org/schemas/ws-addr-conf.xsd
                                         http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd
                                         http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd
                                 http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
                                 http://dnetlib.eu/springbeans/template http://dnetlib.eu/springbeans/template.xsd">
     	<!-- beans -->
     	<bean id="testService"
     		class="eu.dnetlib.enabling.test.TestServiceImpl" />
     	<!-- endpoints -->
     	<jaxws:endpoint id="testServiceEndpoint" implementor="#testService"
     		implementorClass="eu.dnetlib.rmi.soap.TestService"
     		address="/test" />
     	<bean id="testServiceRegistrator"
     		class="eu.dnetlib.common.services.DnetServiceRegistrator"
     		p:service-ref="testService">
     		<property name="protocols">
     			<map>
     				<entry key="SOAP" value="http://${container.hostname}:${container.port}/${container.context}/services/test"/>
     			</map>
     		</property>
     	</bean>
     </beans>

Project

General

Profile

D-Net

Revision 35648

Added by Michele Artini about 9 years ago