Commit 6687b5a0 authored by agrinenwald's avatar agrinenwald Committed by Yann Mombrun

AGR : Upgrade Liferay 7

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/branches/Liferay7/metadata-portlet-OW22@4504 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent c114f269
<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">
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>parent</artifactId>
<version>1.2.8.1</version>
<relativePath>../parent/pom.xml</relativePath>
<version>1.2.8.2-SNAPSHOT</version>
<relativePath />
</parent>
<groupId>org.ow2.weblab.portlets</groupId>
......@@ -37,6 +38,11 @@
<groupId>org.ow2.weblab.components</groupId>
<artifactId>weblab-taglib</artifactId>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<description>This portlet displays WebLab resources metadata.</description>
......@@ -97,6 +103,74 @@
<artifactId>spring-webmvc-portlet</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-selection</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.4.01</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>1.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-portlet-filters</artifactId>
<version>0.3.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
<version>1.2.8</version>
<scope>provided</scope>
</dependency>
<!-- Tests adding all dependencies of librairies/portlets -->
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>weblab-taglib</artifactId>
<version>0.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>1.2.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>2.8.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.joda</groupId>
<artifactId>joda-convert</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>extended</artifactId>
<type>jar</type>
<version>1.2.8</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
......
package org.ow2.weblab.spring.bean;
import java.net.URL;
import org.springframework.remoting.jaxws.JaxWsPortProxyFactoryBean;
public class JarEplorerJaxWsFactoryBean extends JaxWsPortProxyFactoryBean {
private String localWsdlName;
@Override
public void afterPropertiesSet() {
super.afterPropertiesSet();
// This will be a looonnng file:// url, reaching into the jar
// holding the service interface
URL url = getServiceInterface().getResource(localWsdlName);
setWsdlDocumentUrl(url);
}
public void setLocalWsdlName(String localWsdlName) {
this.localWsdlName = localWsdlName;
}
}
\ No newline at end of file
......@@ -43,9 +43,15 @@
type="java.lang.String" name="translationsQueryTemplate" />
</bean>
<bean id="serviceProxy" class="org.springframework.remoting.jaxws.JaxWsPortProxyFactoryBean">
<bean id="serviceProxy" class="org.ow2.weblab.spring.bean.JarEplorerJaxWsFactoryBean">
<property name="serviceInterface" value="org.ow2.weblab.core.services.ResourceContainer" />
<property name="wsdlDocumentUrl" value="classpath:services/WebLab.wsdl" />
<!-- <property name="wsdlDocumentUrl">
<bean class="java.net.URL">
<constructor-arg value="classpath:services/WebLab.wsdl"/>
</bean>
</property> -->
<property name="localWsdlName" value="services/WebLab.wsdl"/>
<property name="lookupServiceOnStartup" value="false"/>
<property name="namespaceUri" value="http://weblab.ow2.org/core/1.2/services" />
<property name="serviceName" value="ResourceContainer" />
<property name="portName" value="ResourceContainerPort" />
......
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<%@ taglib uri="http://org.ow2.weblab/taglib" prefix="weblab"%>
......
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<portlet:defineObjects />
......
<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet"%>
<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
<%@ taglib uri="http://org.ow2.weblab/taglib" prefix="weblab"%>
......
......@@ -23,6 +23,7 @@ import java.util.UUID;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.ow2.weblab.core.extended.factory.WebLabResourceFactory;
import org.ow2.weblab.core.model.Document;
......@@ -35,6 +36,7 @@ import org.springframework.context.support.FileSystemXmlApplicationContext;
/**
* @author ymombrun
*/
@Ignore
public class ServiceTest {
......
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