Commit 7344b946 authored by Arnaud Saval's avatar Arnaud Saval
Browse files

WEBLAB-516 third refactoring to configuration separation

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@2989 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 44f6dd9a
WEBLAB BUNDLE 1.2.5
WEBLAB BUNDLE ${project.version}
OBJECTIVES
This bundle aims to gather coherent services and portlets around the WebLab platform to
......@@ -32,7 +32,7 @@ and four WebLab portlets:
- a annotated document portlet that display the document annotated with the annotation added by the named entities extraction service.
PREREQUISITE
You should have a jdk1.6.25 or greater installed in order to run the WebLab demo,
You should have a jdk1.6.26 or greater installed in order to run the WebLab demo,
JAVA_HOME must be declared and java must be available in your path
Ports 8080, 8005, 8009 (for Liferay), 8181, 8105, 8109 (for Tomcat) 8084, 7600, 7700, 7800, 7900 (for PEtALS) should be available on the computer that runs the WebLab
Your computer should have at least 3Go of RAM to run the WebLab demo but 4Go is recommended to run to process more efficiently.
......@@ -46,7 +46,7 @@ Other ports are used to monitor shutdown/restart command, however since all is i
Only port 8080 needs to be opened if you want to connect an external client to the machine that support the WebLab.
LAUNCHING
1. Launch the script run.sh (Linux) or run.bat (Windows) regarding your OS, (It may takes several minutes)
1. Launch the WebLab wist "weblab.sh start" (Linux) or "weblab.bat start" (Windows) regarding your OS, (It may takes several minutes)
2. Go with your favorite browser to http://localhost:8080/
3. Log in with email demo@weblab-project.org password demo,
4. You can now launch an indexation that will crawl and analyse the content of your "toIndex" folder.
......
......@@ -8,7 +8,6 @@
</formats>
<includeBaseDirectory>true</includeBaseDirectory>
<fileSets>
<fileSet>
<directory>scripts</directory>
......@@ -17,31 +16,40 @@
<fileMode>0755</fileMode>
</fileSet>
<fileSet>
<directory>configuration</directory>
<outputDirectory>configuration</outputDirectory>
<directory>data</directory>
<outputDirectory>data</outputDirectory>
</fileSet>
<fileSet>
<directory>services</directory>
<outputDirectory>${tomcat.path}</outputDirectory>
<filtered>true</filtered>
<fileMode>0755</fileMode>
<directory>conf/tomcat/conf</directory>
<outputDirectory>${tomcat.path}/conf</outputDirectory>
</fileSet>
<!-- Configure services with webdav content manager -->
<fileSet>
<directory>conf/tomcat/contentManager</directory>
<outputDirectory>${tomcat.path}/webapps/folder-listener/WEB-INF/classes</outputDirectory>
</fileSet>
<fileSet>
<directory>conf/tomcat/contentManager</directory>
<outputDirectory>${tomcat.path}/webapps/tika-normaliser/WEB-INF/classes</outputDirectory>
</fileSet>
<fileSet>
<directory>toIndex</directory>
<outputDirectory>toIndex</outputDirectory>
<!-- add solr configuration in WebLab Bundle conf dir -->
<directory>conf/solr</directory>
<outputDirectory>conf/solr</outputDirectory>
</fileSet>
<fileSet>
<directory>warcs</directory>
<outputDirectory>warcs</outputDirectory>
<!-- add weblab-client configuration in WebLab Bundle conf dir -->
<directory>conf/weblab-client</directory>
<outputDirectory>conf/weblab-client</outputDirectory>
</fileSet>
<fileSet>
<!-- Custom Liferay with installed portlets and WebLab messages -->
<directory>liferayData/data</directory>
<directory>conf/liferay/data</directory>
<outputDirectory>${liferay.path}/data/</outputDirectory>
</fileSet>
<fileSet>
<!-- Remove this part if you want a "clean" Liferay -->
<directory>liferayData/html</directory>
<directory>conf/liferay/html</directory>
<outputDirectory>${liferay.tomcat.path}/webapps/ROOT/html/</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
......@@ -69,21 +77,21 @@
<file>
<!-- README file -->
<source>README.txt</source>
<filtered>true</filtered>
</file>
<file>
<!-- Copy WebLab Launcher -->
<source>libraries/weblab-launcher/target/weblab-launcher-1.0.0-SNAPSHOT-jar-with-dependencies.jar</source>
<destName>weblab-launcher.jar</destName>
</file>
<file>
<!-- Support inter pages events in portal-ext.properties -->
<source>liferayData/portal-ext.properties</source>
<source>conf/liferay/portal-ext.properties</source>
<outputDirectory>${liferay.tomcat.path}/webapps/ROOT/WEB-INF/classes/</outputDirectory>
</file>
<file>
<!-- Copy sa in the Petals install dir -->
<source>petals/target/sa-weblab-chain-distribution.zip</source>
<source>chain/target/sa-weblab-chain-distribution.zip</source>
<outputDirectory>${petals.path}/toInstall</outputDirectory>
</file>
<file>
......@@ -111,19 +119,16 @@
<exclude>${liferay.path}/data</exclude>
<exclude>${liferay.path}/data/hsql/lportal.script</exclude>
<exclude>${liferay.path}/data/hsql/lportal.properties</exclude>
<exclude>${liferay.path}/data/lucene</exclude>
<exclude>${liferay.path}/data/jackrabbit</exclude>
<exclude>${liferay.path}/data/jackrabbit</exclude>
<exclude>${liferay.path}/data/lucene/</exclude>
<exclude>${liferay.path}/data/jackrabbit/</exclude>
<!-- Custom template -->
<exclude>${liferay.tomcat.path}/webapps/ROOT/html/common/themes/top_js-ext.jspf</exclude>
<exclude>${liferay.tomcat.path}/webapps/ROOT/html/themes/classic/css/main.css</exclude>
<exclude>${liferay.tomcat.path}/webapps/ROOT/html/themes/classic/images/favicon.ico</exclude>
<!-- Remove JVM -->
<exclude>${liferay.tomcat.path}/jre1.6.0_20</exclude>
<exclude>${liferay.tomcat.path}/jre1.6.0_20/</exclude>
<!-- Remove unused tomcat elements -->
<exclude>${tomcat.path}/bin/catalina.bat</exclude>
<exclude>${tomcat.path}/bin/catalina.sh</exclude>
<exclude>${tomcat.path}/conf/server.xml</exclude>
<exclude>${tomcat.path}/conf/tomcat-users.xml</exclude>
<exclude>${tomcat.path}/webapps/docs/</exclude>
......@@ -149,6 +154,7 @@
<!-- Put WebLab Portlet in Liferay server -->
<dependencySet>
<includes>
<include>org.ow2.weblab.incubation.portlets:*:war:*</include>
<include>org.ow2.weblab.portlets:*:war:*</include>
</includes>
<outputDirectory>${liferay.path}/deploy/</outputDirectory>
......@@ -159,7 +165,10 @@
<!-- Put WebLab Services in Tomcat server -->
<dependencySet>
<includes>
<!-- WebLab Services -->
<include>org.ow2.weblab.webservices:*:war:*</include>
<!-- Solr engine -->
<include>org.apache.solr:solr:war:*</include>
</includes>
<outputDirectory>${tomcat.path}/webapps/${artifact.artifactId}</outputDirectory>
<outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
......@@ -191,4 +200,4 @@
</dependencySets>
</assembly>
</assembly>
\ No newline at end of file
<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>distribution</id>
<formats>
<format>zip</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<files>
<file>
<!-- Copy su in sa install dir -->
<source>su-POJO-ChainService-provide/target/su-POJO-ChainService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-ChainService-consume/target/su-SOAP-ChainService-consume.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-SolrSearcherService-provide/target/su-SOAP-SolrSearcherService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-SolrSearcherService-consume/target/su-SOAP-SolrSearcherService-consume.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-DefaultFolderListenerService-provide/target/su-SOAP-DefaultFolderListenerService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-WarcListenerService-provide/target/su-SOAP-WarcListenerService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-SolrIndexerService-provide/target/su-SOAP-SolrIndexerService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-SimpleRepoService-provide/target/su-SOAP-SimpleRepoService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-SimpleRepoService-consume/target/su-SOAP-SimpleRepoService-consume.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-TikaExtractorServiceService-provide/target/su-SOAP-TikaExtractorServiceService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-GazetteerImplService-provide/target/su-SOAP-GazetteerImplService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-LanguageExtractionService-provide/target/su-SOAP-LanguageExtractionService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-SOAP-GateServiceService-provide/target/su-SOAP-GateServiceService-provide.zip</source>
</file>
<file>
<!-- Copy su in sa install dir -->
<source>su-CHAIN-provide/target/su-CHAIN-provide.zip</source>
</file>
<file>
<!-- Copy jbi in sa install dir -->
<source>jbi.xml</source>
<outputDirectory>META-INF</outputDirectory>
</file>
</files>
</assembly>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<jbi version="1.0" xmlns="http://java.sun.com/xml/ns/jbi">
<service-assembly>
<identification>
<name>sa-weblab-services</name>
<description></description>
</identification>
<service-unit>
<identification>
<name>su-SOAP-DefaultFolderListenerService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-DefaultFolderListenerService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-GateServiceService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-GateServiceService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-GazetteerImplService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-GazetteerImplService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-LanguageExtractionService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-LanguageExtractionService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-WarcListenerService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-WarcListenerService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-SolrIndexerService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-SolrIndexerService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-SolrSearcherService-consume</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-SolrSearcherService-consume.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-SolrSearcherService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-SolrSearcherService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-SimpleRepoService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-SimpleRepoService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-SimpleRepoService-consume</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-SimpleRepoService-consume.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-TikaExtractorServiceService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-TikaExtractorServiceService-provide.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-POJO-ChainService-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-POJO-ChainService-provide.zip</artifacts-zip>
<component-name>petals-se-pojo</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-SOAP-ChainService-consume</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-SOAP-ChainService-consume.zip</artifacts-zip>
<component-name>petals-bc-soap</component-name>
</target>
</service-unit>
<service-unit>
<identification>
<name>su-CHAIN-provide</name>
<description></description>
</identification>
<target>
<artifacts-zip>su-CHAIN-provide.zip</artifacts-zip>
<component-name>weblab-se-chain</component-name>
</target>
</service-unit>
</service-assembly>
</jbi>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<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>
<artifactId>sa-weblab-chain</artifactId>
<name>${project.artifactId}</name>
<packaging>pom</packaging>
<modules>
<module>su-SOAP-DefaultFolderListenerService-provide</module>
<module>su-SOAP-WarcListenerService-provide</module>
<module>su-SOAP-TikaExtractorServiceService-provide</module>
<module>su-SOAP-GazetteerImplService-provide</module>
<module>su-SOAP-LanguageExtractionService-provide</module>
<module>su-SOAP-GateServiceService-provide</module>
<module>su-SOAP-SolrIndexerService-provide</module>
<module>su-SOAP-SimpleRepoService-provide</module>
<module>su-POJO-ChainService-provide</module>
<module>su-CHAIN-provide</module>
<module>su-SOAP-ChainService-consume</module>
<module>su-SOAP-SolrSearcherService-provide</module>
<module>su-SOAP-SolrSearcherService-consume</module>
<module>su-SOAP-SimpleRepoService-consume</module>
<!-- <module>sa-weblab-services</module> -->
</modules>
<build>
<finalName>${project.artifactId}</finalName>
<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>assembly.xml</descriptor>
<finalName>sa-weblab-chain</finalName>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>released third party</id>
<name>Maven repo1 for opensaml</name>
<layout>default</layout>
<url>http://repo1.maven.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
</repositories>
</project>
<?xml version="1.0"?>
<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>
<name>su-CHAIN-provide</name>
<artifactId>su-CHAIN-provide</artifactId>
<groupId>org.ow2.weblab.bundle.petals</groupId>
<version>1.0</version>
<packaging>jbi-service-unit</packaging>
<description></description>
<dependencies>
<dependency>
<groupId>org.ow2.weblab.engines</groupId>
<artifactId>weblab-se-chain</artifactId>
<version>1.1.0-SNAPSHOT</version>
<scope>provided</scope>
<type>jbi-component</type>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.ow2.petals</groupId>
<artifactId>maven-petals-plugin</artifactId>
<version>2.1.2</version>
<extensions>true</extensions>
<configuration>
<jbiName>${project.artifactId}</jbiName>
<updateJBIXml>true</updateJBIXml>
</configuration>
</plugin>
<plugin>
<inherited>true</inherited>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>install</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>petals-link</id>
<url>http://maven.petalslink.com/public/</url>
</repository>
<repository>
<id>ow2.release</id>
<name>OW2 repository</name>
<url>http://maven.ow2.org/maven2</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</repository>
<repository>
<id>ow2.snapshot</id>
<name>OW2 snapshot repository</name>
<url>http://maven.ow2.org/maven2-snapshot</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
</repositories>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<!--
WEBLAB: Service oriented integration platform for media mining and intelligence applications
Copyright (C) 2004 - 2012 Cassidian, an EADS company
This library is free software; you can redistribute it and/or modify it under the terms of
the GNU Lesser General Public License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along with this
library; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
Floor, Boston, MA 02110-1301 USA
-->
<schema targetNamespace="http://weblab.ow2.org/chain/types/"
elementFormDefault="qualified" xmlns="http://www.w3.org/2001/XMLSchema"
xmlns:tns="http://weblab.ow2.org/chain/types/">
<annotation>
<documentation>This schema is used to define common types between ChainDefinition and ChainManagerDefinition.</documentation>
</annotation>
<complexType name="ChainRequestType">
<annotation>
<documentation>This type is the basic chain parameter, containing an optional usageContext and an optional any element, to add application specific parameters, if needed.</documentation>
</annotation>
<sequence>
<element name="usageContext" type="string" maxOccurs="1"
minOccurs="0">
</element>
<element name="parameters" type="anyType" minOccurs="0"
maxOccurs="1"></element>
</sequence>
</complexType>
</schema>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<!-- WEBLAB: Service oriented integration platform for media mining and intelligence
applications Copyright (C) 2004 - 2012 Cassidian, an EADS company This library
is free software; you can redistribute it and/or modify it under the terms
of the GNU Lesser General Public License as published by the Free Software
Foundation; either version 2.1 of the License, or (at your option) any later
version. This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
for more details. You should have received a copy of the GNU Lesser General
Public License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
USA -->
<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
xmlns:tns="http://weblab.ow2.org/chain/manager/" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
xmlns:types="http://weblab.ow2.org/chain/types/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
xmlns:p="http://www.w3.org/2001/XMLSchema" name="ChainManagerDefinition"
targetNamespace="http://weblab.ow2.org/chain/manager/" xmlns:chain="http://weblab.ow2.org/chain/">
<!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
TYPE DEFINITION - List of types participating in this BPEL process The BPEL
Designer will generate default request and response types but you can define
or import any XML Schema type and use them as part of the message types.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
<types>
<schema xmlns="http://www.w3.org/2001/XMLSchema"
attributeFormDefault="unqualified" elementFormDefault="qualified"
targetNamespace="http://weblab.ow2.org/chain/manager/">
<import schemaLocation="Chain.xsd" namespace="http://weblab.ow2.org/chain/types/"></import>
<simpleType name="chainStatusEnum">
<restriction base="string">
<enumeration value="running" />
<enumeration value="stopped" />
<enumeration value="paused" />
</restriction>
</simpleType>
<complexType name="chainStatus">
<sequence>
<element name="chainId" type="string" minOccurs="1"
maxOccurs="1" />
<element name="nbDocOK" type="int" minOccurs="1" maxOccurs="1" />
<element name="nbDocSkipped" type="int" maxOccurs="1"
minOccurs="1" />
<element name="nbDocError" type="int" maxOccurs="1"
minOccurs="1" />
<element name="status" type="tns:chainStatusEnum"
maxOccurs="1" minOccurs="1" />
<element name="lastStartDate" type="dateTime" maxOccurs="1"
minOccurs="0" />
<element name="lastProcessedDocumentDate" type="dateTime"
maxOccurs="1" minOccurs="0" />
</sequence>
</complexType>
<complexType name="StartChainRequest">