Commit c5bd4472 authored by Leila Khelif's avatar Leila Khelif

[WEBLAB-166]: Migrate services and portlets to parents 1.2.2 (for model 1.2.2)

http://jira.ow2.org/browse/WEBLAB-166

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabServices/Portlets/metadata-portlet@2054 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent dc79eff2
......@@ -4,7 +4,7 @@
<parent>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>parent</artifactId>
<version>1.2.2-SNAPSHOT</version>
<version>1.2.2</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
......
......@@ -40,14 +40,9 @@ import javax.portlet.ResourceResponse;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.ow2.weblab.portlet.bean.AnnotationsDescBean;
import org.ow2.weblab.portlet.bean.MetaConfBean;
import org.ow2.weblab.portlet.bean.RepoServiceConfigBean;
import org.ow2.weblab.portlet.tool.ResourceContainerUtil;
import org.ow2.weblab.core.extended.exception.WebLabCheckedException;
import org.ow2.weblab.core.extended.ontologies.WebLab;
import org.ow2.weblab.core.extended.ontologies.WebLabRetrieval;
import org.ow2.weblab.core.extended.util.ResourceUtil;
import org.ow2.weblab.core.helper.BeanHelper;
import org.ow2.weblab.core.helper.impl.AdvancedSelector;
import org.ow2.weblab.core.helper.impl.RDFSelectorFactory;
import org.ow2.weblab.core.helper.impl.Statements;
......@@ -58,6 +53,13 @@ import org.ow2.weblab.core.model.PieceOfKnowledge;
import org.ow2.weblab.core.model.Resource;
import org.ow2.weblab.core.services.ResourceContainer;
import org.ow2.weblab.core.services.resourcecontainer.LoadResourceArgs;
import org.ow2.weblab.portlet.bean.AnnotationsDescBean;
import org.ow2.weblab.portlet.bean.MetaConfBean;
import org.ow2.weblab.portlet.bean.RepoServiceConfigBean;
import org.ow2.weblab.portlet.tool.ResourceContainerUtil;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.xml.XmlBeanFactory;
import org.springframework.core.io.ClassPathResource;
/**
......@@ -72,7 +74,7 @@ public class MetaDataPortlet extends WebLabPortlet {
* Namespace property used in PieceOkKnowledge to get the Document to
* display URI
*/
private static final String POK_PROPERTY_DOC_URI = WebLab.IS_LINKED_TO;
private static final String POK_PROPERTY_DOC_URI = WebLabRetrieval.IS_LINKED_TO;
// Private fields used for session
......@@ -173,12 +175,10 @@ public class MetaDataPortlet extends WebLabPortlet {
/*
* getting meta-data description list from a XML bean, using Spring
*/
BeanHelper factory = BeanHelper.getInstance().getSpecificInstance(
getPortletContext().getRealPath(
"WEB-INF/classes/conf_meta.xml"), true);
this.rdfProperties = factory.getBean("metaConf",
AnnotationsDescBean.class);
ClassPathResource resource = new ClassPathResource("conf_meta.xml");
BeanFactory factory = new XmlBeanFactory(resource);
this.rdfProperties = factory.getBean("metaConf", AnnotationsDescBean.class);
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment