Author: enridaga
Date: Thu Jul 24 09:16:02 2014
New Revision: 1613046
URL: http://svn.apache.org/r1613046
Log:
Added SCR java annotations on ReasoningServiceManagerImpl. Fixed link in
template. Fix STANBOL-1366 and STANBOL-1367
Modified:
stanbol/branches/release-0.12/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
stanbol/branches/release-0.12/reasoners/web/src/main/resources/templates/html/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/index.ftl
Modified:
stanbol/branches/release-0.12/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java?rev=1613046&r1=1613045&r2=1613046&view=diff
==============================================================================
---
stanbol/branches/release-0.12/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
(original)
+++
stanbol/branches/release-0.12/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
Thu Jul 24 09:16:02 2014
@@ -20,6 +20,11 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.apache.felix.scr.annotations.ReferencePolicy;
+import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.reasoners.servicesapi.ReasoningService;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServicesManager;
import
org.apache.stanbol.reasoners.servicesapi.UnboundReasoningServiceException;
@@ -38,6 +43,9 @@ import org.slf4j.LoggerFactory;
*
interface="org.apache.stanbol.reasoners.servicesapi.ReasoningService"
cardinality="0..n"
* policy="dynamic")
*/
+@Component(immediate = true)
+@Service
+@Reference(name= "ReasoningService", referenceInterface =
ReasoningService.class, policy = ReferencePolicy.DYNAMIC, cardinality =
ReferenceCardinality.OPTIONAL_MULTIPLE, bind = "bindReasoningService", unbind =
"unbindReasoningService")
public class ReasoningServicesManagerImpl implements ReasoningServicesManager {
private static final Logger log =
LoggerFactory.getLogger(ReasoningServicesManagerImpl.class);
Modified:
stanbol/branches/release-0.12/reasoners/web/src/main/resources/templates/html/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/index.ftl
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/reasoners/web/src/main/resources/templates/html/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/index.ftl?rev=1613046&r1=1613045&r2=1613046&view=diff
==============================================================================
---
stanbol/branches/release-0.12/reasoners/web/src/main/resources/templates/html/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/index.ftl
(original)
+++
stanbol/branches/release-0.12/reasoners/web/src/main/resources/templates/html/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/index.ftl
Thu Jul 24 09:16:02 2014
@@ -27,7 +27,7 @@
<p>Each reasoning service can be accessed to perform one of three tasks:
classification, consistency check, get all inferences</p>
<ul>
<#list it.servicesDescription as service>
- <@serviceDescription.li name="${service.name}"
fullpath="${it.currentPath}/${service.path}" path="${service.path}"
description="${service.description}"/>
+ <@serviceDescription.li name="${service.name}"
fullpath="${it.publicBaseUri}${it.currentPath}/${service.path}"
path="${service.path}" description="${service.description}"/>
<ul>
<#-- TODO: generate the task list dinamically -->
<li><a
href="${it.publicBaseUri}${it.currentPath}/${service.path}/classify"
title="${service.name} Task: classify">classify</a></li>
