Commit 6f970cd6 authored by Arnaud Saval's avatar Arnaud Saval
Browse files

WEBLAB-1260 Upgrade version and configuration files

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@3873 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent d763599b
......@@ -53,4 +53,4 @@ File processing chain is started automatically, go to the 'Search' tab, then you
More details
**************************************************************************************
More details and information about the Bundle are available at the following address: http://weblab-project.org/index.php?title=Bundle_2.0.0
More details and information about the Bundle are available at the following address: http://weblab-project.org/index.php?title=Bundle
......@@ -64,6 +64,10 @@
</fileSet>
</fileSets>
<files>
<file>
<source>../chain/services/ServicesContext.xml</source>
<outputDirectory>${karaf.path}/deploy/</outputDirectory>
</file>
<file>
<source>../scripts/weblab.sh</source>
<outputDirectory>.</outputDirectory>
......@@ -203,6 +207,14 @@
</includes>
<outputDirectory>${tomcat.path}/webapps/solr/WEB-INF/lib/</outputDirectory>
</dependencySet>
<!-- add Solr config -->
<dependencySet>
<includes>
<include>org.ow2.weblab.components:solr-config:jar:*</include>
</includes>
<outputDirectory>conf/</outputDirectory>
<unpack>true</unpack>
</dependencySet>
<!-- Libs for servers management-->
......
......@@ -34,13 +34,13 @@
<version>${weblab.bundle.version}</version>
<type>tar.gz</type>
</dependency>
<dependency>
<!-- <dependency>
<groupId>org.apache.jena</groupId>
<artifactId>jena-fuseki</artifactId>
<version>${fuseki.version}</version>
<classifier>distribution</classifier>
<type>zip</type>
</dependency>
</dependency> -->
<!-- Services -->
......@@ -150,6 +150,11 @@
<artifactId>slf4j-api</artifactId>
<version>${slf.version}</version>
</dependency>
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>solr-config</artifactId>
<version>${solr.config.version}</version>
</dependency>
<!-- Liferay WebLab Team -->
<dependency>
......@@ -194,7 +199,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>${maven.assembly-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
......
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:soap="http://cxf.apache.org/bindings/soap" xmlns:camel="http://camel.apache.org/schema/spring"
xmlns:cxf="http://camel.apache.org/schema/cxf" xmlns:osgi="http://www.springframework.org/schema/osgi"
xsi:schemaLocation="http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://camel.apache.org/schema/spring
http://camel.apache.org/schema/spring/camel-spring.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://cxf.apache.org/jaxws
http://cxf.apache.org/schemas/jaxws.xsd
http://camel.apache.org/schema/cxf
http://camel.apache.org/schema/cxf/camel-cxf.xsd" >
<!--======================================================= -->
<!--========== SOAP SERVICES =========== -->
<!--======================================================= -->
<cxf:cxfEndpoint id="tika"
address="http://localhost:8181/tika-normaliser/analyser" serviceClass="org.ow2.weblab.core.services.Analyser">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="ngramj"
address="http://localhost:8181/ngramj-language-extraction/analyser"
serviceClass="org.ow2.weblab.core.services.Analyser">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="gate"
address="http://localhost:8181/gate-extraction/analyser"
serviceClass="org.ow2.weblab.core.services.Analyser">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="solr"
address="http://localhost:8181/solr-engine/indexer" serviceClass="org.ow2.weblab.core.services.Indexer">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="repository"
address="http://localhost:8181/simple-file-repository/resourceContainer"
serviceClass="org.ow2.weblab.core.services.ResourceContainer">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<!--======================================================= -->
<!--========== OSGi SERVICES =========== -->
<!--======================================================= -->
<osgi:service id="osgi-service-tika" ref="tika" interface="org.apache.camel.Endpoint">
<osgi:service-properties>
<entry key="name" value="service-tika"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-ngramj" ref="ngramj" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-ngramj"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-gate" ref="gate" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-gate"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-solr" ref="solr" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-solr"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-repository" ref="repository" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-repository"/>
</osgi:service-properties>
</osgi:service>
<!--======================================================= -->
<!--========== WebLab Services CONTEXT =========== -->
<!--======================================================= -->
<camelContext id="weblabServicesContext" xmlns="http://camel.apache.org/schema/spring" />
</beans>
\ No newline at end of file
......@@ -26,7 +26,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.6</version>
<executions>
<execution>
<id>filter</id>
......
......@@ -25,7 +25,6 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>2.4.0</version>
<extensions>true</extensions>
<configuration>
......
......@@ -42,87 +42,6 @@
<property name="connectionFactory" ref="jmsConnectionFactory" />
</bean>
<!--======================================================= -->
<!--========== WEB SERVICES =========== -->
<!--======================================================= -->
<cxf:cxfEndpoint id="tika"
address="http://localhost:8181/tika-normaliser/analyser" serviceClass="org.ow2.weblab.core.services.Analyser">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="ngramj"
address="http://localhost:8181/ngramj-language-extraction/analyser"
serviceClass="org.ow2.weblab.core.services.Analyser">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="gate"
address="http://localhost:8181/gate-extraction/analyser"
serviceClass="org.ow2.weblab.core.services.Analyser">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="solr"
address="http://localhost:8181/solr-engine/indexer" serviceClass="org.ow2.weblab.core.services.Indexer">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<cxf:cxfEndpoint id="repository"
address="http://localhost:8181/simple-file-repository/resourceContainer"
serviceClass="org.ow2.weblab.core.services.ResourceContainer">
<cxf:properties>
<entry key="dataFormat" value="PAYLOAD" />
<entry key="allowStreaming" value="true" />
</cxf:properties>
</cxf:cxfEndpoint>
<!--======================================================= -->
<!--========== OSGi SERVICES =========== -->
<!--======================================================= -->
<osgi:service id="osgi-service-tika" ref="tika" interface="org.apache.camel.Endpoint">
<osgi:service-properties>
<entry key="name" value="service-tika"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-ngramj" ref="ngramj" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-ngramj"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-gate" ref="gate" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-gate"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-solr" ref="solr" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-solr"/>
</osgi:service-properties>
</osgi:service>
<osgi:service id="osgi-service-repository" ref="repository" interface="org.apache.camel.Endpoint" >
<osgi:service-properties>
<entry key="name" value="service-repository"/>
</osgi:service-properties>
</osgi:service>
<!--======================================================= -->
<!--========== CAMEL CONTEXT =========== -->
<!--======================================================= -->
......
<?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 http://maven.apache.org/xsd/maven-4.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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
......@@ -10,165 +11,165 @@
<relativePath>../pom.xml</relativePath>
</parent>
<groupId>org.ow2.weblab.osgi</groupId>
<artifactId>karaf-weblab</artifactId>
<groupId>org.ow2.weblab.osgi</groupId>
<artifactId>karaf-weblab</artifactId>
<packaging>pom</packaging>
<name>WebLab Custom Karaf Distribution which contains WebLab camel OSGi component and processing chains.</name>
<packaging>karaf-assembly</packaging>
<name>WebLab Custom Karaf Distribution.</name>
<properties>
<dependencies>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>framework</artifactId>
<version>${karaf.version}</version>
<type>kar</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.features</groupId>
<artifactId>standard</artifactId>
<version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-karaf</artifactId>
<version>${activemq.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.camel.karaf</groupId>
<artifactId>apache-camel</artifactId>
<version>${camel.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>io.hawt</groupId>
<artifactId>hawtio-karaf</artifactId>
<version>${hawtio.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.ow2.weblab.engine</groupId>
<artifactId>camel-weblab-karaf</artifactId>
<version>${weblab.bundle.version}</version>
<type>xml</type>
<classifier>features</classifier>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.ow2.weblab.osgi</groupId>
<artifactId>weblab-camel-chains-karaf</artifactId>
<version>${weblab.bundle.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependencies>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>default-resources</id>
<phase>prepare-package</phase>
<goals>
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/assembly</outputDirectory>
<resources>
<resource>
<directory>${basedir}/src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>karaf-maven-plugin</artifactId>
<version>3.0.3</version>
<extensions>true</extensions>
<configuration>
<archiveZip>false</archiveZip>
<!-- no startupFeatures -->
<bootFeatures>
<feature>standard</feature>
<feature>management</feature>
<feature>cxf</feature>
<feature>obr</feature>
<feature>config</feature>
<feature>activemq-broker</feature>
<feature>camel</feature>
<feature>camel-cxf</feature>
<feature>camel-blueprint</feature>
<feature>camel-jaxb</feature>
<feature>camel-saxon</feature>
<feature>camel-weblab</feature>
<feature>camel-jms</feature>
<feature>camel-xmlsecurity</feature>
<feature>camel-flatpack </feature>
<feature>hawtio-offline</feature>
<feature>ssh</feature>
<feature>weblab-camel-chains</feature>
</bootFeatures>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>install-file</goal>
</goals>
<phase>install</phase>
<configuration>
<file>${project.build.directory}/${project.build.finalName}.tar.gz
</file>
<generatePom>false</generatePom>
<pomFile>pom.xml</pomFile>
<packaging>tar.gz</packaging>
<version>${project.version}</version>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
<executions>
<execution>
<goals>
<goal>deploy-file</goal>
</goals>
<phase>deploy</phase>
<configuration>
<generatePom>false</generatePom>
<pomFile>pom.xml</pomFile>
<packaging>tar.gz</packaging>
<version>${project.version}</version>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<dependencies>
<dependency>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<version>${karaf.version}</version>
<type>tar.gz</type>
</dependency>
<dependency>
<groupId>org.apache.karaf.assemblies.features</groupId>
<artifactId>standard</artifactId>
<version>${karaf.version}</version>
<type>xml</type>
<classifier>features</classifier>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>src/main/filtered-resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*</include>
</includes>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
<id>filter</id>
<phase>generate-resources</phase>
<goals>
<goal>resources</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.karaf.tooling</groupId>
<artifactId>features-maven-plugin</artifactId>
<version>2.2.4</version>
<executions>
<execution>
<id>add-features-to-repo</id>
<phase>generate-resources</phase>
<goals>
<goal>add-features-to-repo</goal>
</goals>
<configuration>
<descriptors>
<descriptor>mvn:org.apache.karaf.assemblies.features/standard/${karaf.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.activemq/activemq-karaf/${activemq.version}/xml/features</descriptor>
<descriptor>mvn:org.apache.camel.karaf/apache-camel/${camel.version}/xml/features</descriptor>
<descriptor>mvn:io.hawt/hawtio-karaf/${hawtio.version}/xml/features</descriptor>
<descriptor>mvn:org.ow2.weblab.engine/camel-weblab-karaf/${weblab.bundle.version}/xml/features</descriptor>
<descriptor>mvn:org.ow2.weblab.osgi/weblab-camel-chains-karaf/${weblab.bundle.version}/xml/features</descriptor>
</descriptors>
<features>
<feature>cxf</feature>
<feature>obr</feature>
<feature>config</feature>
<feature>activemq-broker</feature>
<feature>camel</feature>
<feature>camel-cxf</feature>
<feature>camel-blueprint</feature>
<feature>camel-jaxb</feature>
<feature>camel-saxon</feature>
<feature>camel-weblab</feature>
<feature>camel-jms</feature>
<feature>camel-xmlsecurity</feature>
<feature>camel-cache</feature>
<feature>management</feature>
<feature>hawtio-offline</feature>
<feature>ssh</feature>
<feature>weblab-camel-chains</feature>
</features>
<includeMvnBasedDescriptors>true</includeMvnBasedDescriptors>
<repository>target/features-repo</repository>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<executions>
<execution>
<!-- Uncompress the standard Karaf distribution -->
<id>unpack</id>
<phase>generate-resources</phase>
<goals>
<goal>unpack</goal>
</goals>
<configuration>
<artifactItems>
<artifactItem>
<groupId>org.apache.karaf</groupId>
<artifactId>apache-karaf</artifactId>
<type>tar.gz</type>
<outputDirectory>target/dependencies</outputDirectory>
</artifactItem>
</artifactItems>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>single</goal>
</goals>
<configuration>
<descriptors>
<descriptor>src/main/descriptors/bin.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
<tarLongFileMode>gnu</tarLongFileMode>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
<goals>
<goal>install-file</goal>
</goals>
<phase>install</phase>
<configuration>
<file>${project.build.directory}/${project.build.finalName}.tar.gz</file>
<generatePom>false</generatePom>
<pomFile>pom.xml</pomFile>
<packaging>tar.gz</packaging>
<version>${project.version}</version>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
<assembly>
<id>bin</id>
<formats>
<format>tar.gz</format>
</formats>
<fileSets>
<!-- Expanded Ka