Commit 22026690 authored by Arnaud Saval's avatar Arnaud Saval
Browse files

WEBLAB-737 remove some libraries from Liferay lib/ext and disable custom portlets

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@2953 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 71e3b0e2
......@@ -50,16 +50,16 @@
<directory>libraries/services/target/services-libs</directory>
<outputDirectory>${tomcat.path}/lib/</outputDirectory>
</fileSet>
<!-- Put Commons libraries into Liferay -->
<!-- Put Commons libraries into Liferay -->
<fileSet>
<directory>libraries/portlets/target/portlets-libs</directory>
<outputDirectory>${liferay.tomcat.path}/lib/ext</outputDirectory>
</fileSet>
<!-- Copy portlets into Liferay deploy directory -->
<!-- Copy portlets into Liferay deploy directory
<fileSet>
<directory>libraries/portlets/wars</directory>
<outputDirectory>${liferay.path}/deploy/</outputDirectory>
</fileSet>
</fileSet> -->
</fileSets>
<files>
<file>
......@@ -130,6 +130,16 @@
<fileMode>0755</fileMode>
</dependencySet>
<!-- Put WebLab Portlet in Liferay server -->
<dependencySet>
<includes>
<include>org.ow2.weblab.portlets:*:war:*</include>
</includes>
<outputDirectory>${liferay.path}/deploy/</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
<!-- Put WebLab Services in Tomcat server -->
<dependencySet>
<includes>
......@@ -182,6 +192,7 @@
<includes>
<include>org.ow2.petals:petals-bc-soap:zip:*</include>
<include>org.ow2.petals:petals-se-pojo:zip:*</include>
<include>org.ow2.weblab.engines:weblab-se-chain:zip:*</include>
</includes>
<outputDirectory>${petals.path}/toInstall</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
......
......@@ -12,6 +12,13 @@
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<excludes>
<exclude>slf4j-*:*</exclude>
<exclude>xercesImpl-*:*</exclude>
<exclude>xml-apis-*:*</exclude>
<exclude>commons-logging-*:*</exclude>
<exclude>log4j-*:*</exclude>
</excludes>
</dependencySet>
</dependencySets>
......
<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.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
<artifactId>document-viewer-portlet</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>${artifactId}</artifactId>
<version>${portlet.document-viewer-portlet.version}</version>
<type>war</type>
</dependency>
</dependencies>
</project>
<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.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
<artifactId>weblab-facet</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>${artifactId}</artifactId>
<version>${portlet.facet-portlet.version}</version>
<type>war</type>
</dependency>
</dependencies>
</project>
<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.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
<artifactId>launch-chain-portlet</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>${artifactId}</artifactId>
<version>${portlet.launch-chain-portlet.version}</version>
<type>war</type>
</dependency>
</dependencies>
</project>
<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.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
<artifactId>weblab-metaview</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>${artifactId}</artifactId>
<version>${portlet.metadata-portlet.version}</version>
<type>war</type>
</dependency>
</dependencies>
</project>
<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.bundle</groupId>
<artifactId>versions</artifactId>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
<groupId>org.ow2.weblab.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
</execution>
</executions>
<configuration>
<descriptor>../portlet-assembly.xml</descriptor>
<finalName>${artifactId}</finalName>
<encoding>UTF-8</encoding>
<appendAssemblyId>false</appendAssemblyId>
<outputDirectory>../wars</outputDirectory>
</configuration>
</plugin>
</plugins>
</build>
</project>
\ No newline at end of file
......@@ -16,14 +16,14 @@
<name>WebLab Portlets assembly.</name>
<description>WebLab Portlets.</description>
<modules>
<!-- <modules>
<module>launch-chain</module>
<module>result</module>
<module>docview</module>
<module>search</module>
<module>metadata</module>
<module>facet</module>
</modules>
</modules> -->
<dependencies>
......@@ -46,7 +46,7 @@
<version>${weblab.annotator.version}</version>
<type>jar</type>
</dependency>
<dependency>
<!-- <dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena</artifactId>
<version>${weblab.rdf-helper-jena.version}</version>
......@@ -63,61 +63,13 @@
<artifactId>rdf-helper-jena-structure</artifactId>
<version>${weblab.rdf-helper-jena-structure.version}</version>
<type>jar</type>
</dependency>
</dependency> -->
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-portlet</artifactId>
<version>${weblab.weblab-portlet.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json-simple.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons-io.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>${commons-logging.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
......@@ -130,10 +82,16 @@
<version>${jstl.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<build>
<build>
<finalName>portlets</finalName>
<plugins>
<plugin>
......@@ -156,7 +114,7 @@
</plugin>
</plugins>
</build>
</build>
<repositories>
<repository>
......
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>portlet</id>
<formats>
<format>war</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>WEB-INF/lib/model-1.2*</exclude>
<exclude>WEB-INF/lib/extended-1.2*</exclude>
<exclude>WEB-INF/lib/annotator-1.2*</exclude>
<exclude>WEB-INF/lib/dataoperator*</exclude>
<exclude>WEB-INF/lib/commons-io-*</exclude>
<exclude>WEB-INF/lib/commons-codec-*</exclude>
<exclude>WEB-INF/lib/joda-time-*</exclude>
<exclude>WEB-INF/lib/xalan-*</exclude>
<exclude>WEB-INF/lib/spring-*</exclude>
<exclude>WEB-INF/lib/jena-*</exclude>
<exclude>WEB-INF/lib/rdf-helper-jena*</exclude>
<exclude>WEB-INF/lib/stax2-api-*</exclude>
<exclude>WEB-INF/lib/xml-resolver-*</exclude>
<exclude>WEB-INF/lib/asm-*</exclude>
<exclude>WEB-INF/lib/jaxb-impl-*</exclude>
<exclude>WEB-INF/lib/xml-apis-*</exclude>
<exclude>WEB-INF/lib/serializer-*</exclude>
<exclude>WEB-INF/lib/xercesImpl-*</exclude>
<exclude>WEB-INF/lib/xmlschema-core-*</exclude>
<exclude>WEB-INF/lib/geronimo-javamail*</exclude>
<exclude>WEB-INF/lib/woodstox-core-asl-*</exclude>
</excludes>
</unpackOptions>
</dependencySet>
</dependencySets>
</assembly>
<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.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
<artifactId>result-portlet</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>${artifactId}</artifactId>
<version>${portlet.result-portlet.version}</version>
<type>war</type>
</dependency>
</dependencies>
</project>
<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.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
<artifactId>advanced-search-portlet</artifactId>
<packaging>war</packaging>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>${artifactId}</artifactId>
<version>${portlet.advanced-search-portlet.version}</version>
<type>war</type>
</dependency>
</dependencies>
</project>
......@@ -15,7 +15,7 @@
<dependency>
<groupId>org.ow2.petals</groupId>
<artifactId>petals-se-pojo</artifactId>
<version>2.2</version>
<version>2.2.6</version>
<scope>provided</scope>
<type>jbi-component</type>
</dependency>
......@@ -28,7 +28,7 @@
<dependency>
<artifactId>petals-cdk-core</artifactId>
<groupId>org.ow2.petals</groupId>
<version>5.1.1</version>
<version>5.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
......@@ -44,20 +44,26 @@
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.ow2.weblab.petals</groupId>
<groupId>org.ow2.weblab.engines</groupId>
<artifactId>pojo-utils</artifactId>
<version>1.2-SNAPSHOT</version>
<version>1.2.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>1.2.4.1</version>
<version>1.2.5</version>
</dependency>
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>resources-merger</artifactId>
<version>1.0.0</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.8.2</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
......
......@@ -42,12 +42,9 @@ import org.ow2.weblab.core.services.indexer.IndexArgs;
import org.ow2.weblab.core.services.queuemanager.NextResourceArgs;
import org.ow2.weblab.core.services.resourcecontainer.SaveResourceArgs;
import org.ow2.weblab.petals.JbiServiceFactory;
<<<<<<< .mine
import org.ow2.weblab.rdf.Value;
import org.ow2.weblab.utils.WebLabRunnable;
import org.purl.dc.elements.DublinCoreAnnotator;
=======
>>>>>>> .r2935
import org.w3c.dom.Document;
/**
......
......@@ -155,6 +155,12 @@
<version>${petals.se-pojo.version}</version>
<type>zip</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.engines</groupId>
<artifactId>weblab-se-chain</artifactId>
<version>${petals.se-weblab-chain.version}</version>
<type>zip</type>
</dependency>
</dependencies>
......
......@@ -12,8 +12,10 @@ call ${petals.path}\bin\startup.bat
timeout 10
if not exist ${petals.path}\toInstall\petals-se-pojo.zip goto finish
echo Installing Se-Pojo
echo Installing Petals-se-pojo
move .\${petals.path}\toInstall\petals-se-pojo.zip .\${petals.path}\install\petals-se-pojo.zip
echo Installing Weblab-se-chain
move .\${petals.path}\toInstall\weblab-se-chain.zip .\${petals.path}\install\weblab-se-chain.zip
echo Installing BC SOAP
move .\petals-platform-3.1.3\toInstall\petals-bc-soap.zip .\petals-platform-3.1.3\install\petals-bc-soap.zip
timeout 20
......
......@@ -13,9 +13,12 @@ then
echo Installing bc-SOAP
mv ./${petals.path}/toInstall/petals-bc-soap.zip ./${petals.path}/install/petals-bc-soap.zip
sleep 5
echo Installing se-POJO
echo Installing petals-se-pojo
mv ./${petals.path}/toInstall/petals-se-pojo.zip ./${petals.path}/install/petals-se-pojo.zip
sleep 5
echo Installing Weblab-se-chain
mv ./${petals.path}/toInstall/weblab-se-chain.zip ./${petals.path}/install/weblab-se-chain.zip
sleep 5
echo Installing Service Chain
mv ./${petals.path}/toInstall/sa-weblab-chain-distribution.zip ./${petals.path}/install/sa-weblab-chain-distribution.zip
sleep 5
......
......@@ -79,6 +79,7 @@
<!-- Petals components and engines versions -->
<petals.bc-soap.version>4.0.8</petals.bc-soap.version>
<petals.se-pojo.version>2.2.6</petals.se-pojo.version>
<petals.se-weblab-chain.version>1.1.0-SNAPSHOT</petals.se-weblab-chain.version>
<!-- Maven Plugins versions -->
......
Supports Markdown
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