Commit 2f94f659 authored by Yann Mombrun's avatar Yann Mombrun
Browse files

Minor of cleanups and update of assemblies/poms (reduce number of dependencies).

WEBLAB-1463 - Add metadata edition using a rest endpoint exposed by Karaf

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@4397 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 29ad72a4
<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">
<?xml version="1.0" encoding="UTF-8"?>
<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.0.0 http://maven.apache.org/xsd/assembly-2.0.0.xsd">
<id>distribution</id>
<formats>
<format>${assembly.format}</format>
</formats>
......@@ -18,6 +20,17 @@
<directory>../conf/tomcat/conf</directory>
<outputDirectory>${tomcat.path}/conf</outputDirectory>
</fileSet>
<fileSet>
<!-- copy tomcat server.xml and cxf samples -->
<directory>../conf/samples</directory>
<outputDirectory>conf/samples</outputDirectory>
</fileSet>
<fileSet>
<!-- copy configured cxf for simple-file-repository -->
<directory>../conf/services</directory>
<outputDirectory>conf/services</outputDirectory>
</fileSet>
<fileSet>
<!-- add weblab-client/filter configuration in WebLab Bundle conf dir -->
<directory>../conf/exposed-configuration</directory>
......@@ -29,14 +42,10 @@
<outputDirectory>${liferay.tomcat.path}/lib/ext</outputDirectory>
</fileSet>
<fileSet>
<!-- copy tomcat server.xml and cxf samples -->
<directory>../conf/samples</directory>
<outputDirectory>conf/samples</outputDirectory>
</fileSet>
<fileSet>
<!-- copy configured cxf for simple-file-repository -->
<directory>../conf/services</directory>
<outputDirectory>conf/services</outputDirectory>
<!-- Copy custom karaf server into the bundle -->
<directory>../karaf-weblab/target/assembly</directory>
<outputDirectory>${karaf.path}</outputDirectory>
<fileMode>0755</fileMode>
</fileSet>
</fileSets>
......@@ -49,14 +58,12 @@
<file>
<!-- Put the Linux starting script inside the bundle -->
<source>../scripts/weblab.sh</source>
<outputDirectory>.</outputDirectory>
<filtered>true</filtered>
<fileMode>0755</fileMode>
</file>
<file>
<!-- Put the Windows starting script inside the bundle -->
<source>../scripts/weblab.bat</source>
<outputDirectory>.</outputDirectory>
<filtered>true</filtered>
<fileMode>0755</fileMode>
</file>
......@@ -71,11 +78,6 @@
<outputDirectory>conf</outputDirectory>
<filtered>true</filtered>
</file>
<file>
<!-- Copy WebLab Launcher -->
<source>../libraries/weblab-launcher/target/weblab-launcher-${weblab.bundle.version}-jar-with-dependencies.jar</source>
<destName>weblab-launcher.jar</destName>
</file>
<file>
<!-- Support inter pages events in portal-ext.properties -->
<source>../conf/liferay/portal-ext.properties</source>
......@@ -95,14 +97,20 @@
<!-- Add LGPL license -->
<source>../LICENCE</source>
</file>
<file>
<!-- Copy WebLab Launcher -->
<source>../libraries/weblab-launcher/target/weblab-launcher-${weblab.bundle.version}-jar-with-dependencies.jar</source>
<destName>weblab-launcher.jar</destName>
</file>
</files>
<dependencySets>
<!-- Extract Tomcat server, filter out unused files/folders and at it to the bundle -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.tomcat:tomcat:zip</include>
</includes>
......@@ -131,11 +139,11 @@
<!-- Extract Liferay server, filter out unused files/folders and at it to the bundle -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>com.liferay:liferay-portal-tomcat:zip</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useStrictFiltering>true</useStrictFiltering>
<unpack>true</unpack>
<unpackOptions>
<excludes>
......@@ -170,25 +178,13 @@
</dependencySet>
<!-- Extract custom karaf server and at it to the bundle -->
<dependencySet>
<includes>
<include>org.ow2.weblab.osgi:karaf-weblab:tar.gz</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useStrictFiltering>true</useStrictFiltering>
<unpack>true</unpack>
<fileMode>0755</fileMode>
</dependencySet>
<!-- Extract activemq server tar.gz, filter out unused files/folders and at it to the bundle -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.activemq:apache-activemq:tar.gz</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useStrictFiltering>true</useStrictFiltering>
<unpack>true</unpack>
<unpackOptions>
<excludes>
......@@ -207,11 +203,11 @@
<!-- Extract activemq server zip, filter out everything but windows specific files at them to the bundle -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.activemq:apache-activemq:zip</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useStrictFiltering>true</useStrictFiltering>
<unpack>true</unpack>
<unpackOptions>
<excludes>
......@@ -238,11 +234,11 @@
<!-- Extract solr server, filter out unused files/folders and at it to the bundle -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.apache.solr:solr:tgz</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useStrictFiltering>true</useStrictFiltering>
<unpack>true</unpack>
<unpackOptions>
<excludes>
......@@ -262,6 +258,7 @@
<!-- Put WebLab Portlet in Liferay server -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.ow2.weblab.portlets:*:war:*</include>
</includes>
......@@ -273,8 +270,8 @@
<!-- Put WebLab Services in Tomcat server -->
<dependencySet>
<!-- <useStrictFiltering>true</useStrictFiltering> -->
<includes>
<!-- WebLab Services -->
<include>org.ow2.weblab.webservices:*:war:*</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
......@@ -286,16 +283,17 @@
<exclude>WEB-INF/classes/contentManager.properties</exclude>
</excludes>
</unpackOptions>
<fileMode>0755</fileMode>
</dependencySet>
<!-- Put Solr configuration -->
<dependencySet>
<useStrictFiltering>true</useStrictFiltering>
<includes>
<include>org.ow2.weblab.components:solr-config:jar:*</include>
</includes>
<useTransitiveDependencies>false</useTransitiveDependencies>
<useStrictFiltering>true</useStrictFiltering>
<outputDirectory>${solr.path}/</outputDirectory>
<unpack>true</unpack>
<unpackOptions>
......@@ -303,6 +301,7 @@
<exclude>META-INF/</exclude>
</excludes>
</unpackOptions>
<fileMode>0755</fileMode>
</dependencySet>
</dependencySets>
......
......@@ -41,18 +41,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ow2.weblab.osgi</groupId>
<artifactId>karaf-weblab</artifactId>
<version>${weblab.bundle.version}</version>
<type>tar.gz</type>
<exclusions>
<exclusion>
<groupId>*</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- solr binaries -->
<dependency>
......@@ -157,7 +145,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.ow2.weblab.webservices</groupId>
<artifactId>solr-engine</artifactId>
......@@ -288,10 +275,14 @@
</executions>
<configuration>
<tarLongFileMode>gnu</tarLongFileMode>
<descriptor>assembly.xml</descriptor>
<descriptors>
<descriptor>assembly.xml</descriptor>
</descriptors>
<finalName>WebLab-Bundle-${maven.build.timestamp}</finalName>
<encoding>UTF-8</encoding>
<encoding>${project.build.sourceEncoding}</encoding>
<outputDirectory>../target</outputDirectory>
<recompressZippedFiles>true</recompressZippedFiles>
<attach>true</attach>
</configuration>
</plugin>
</plugins>
......
<?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"
xmlns:weblab="http://weblab.ow2.org/schema/spring"
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://weblab.ow2.org/schema/spring
http://weblab.ow2.org/schema/spring/weblab-spring.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" >
<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" xmlns:weblab="http://weblab.ow2.org/schema/spring"
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://weblab.ow2.org/schema/spring http://weblab.ow2.org/schema/spring/weblab-spring.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">
<!--======================================================= -->
<!--========== WEBLAB SERVICES =========== -->
......@@ -25,10 +16,10 @@
<weblab:analyser id="service-gate" address="http://localhost:8181/gate-extraction/analyser" />
<weblab:indexer id="service-solr" address="http://localhost:8181/solr-engine/indexer" />
<weblab:container id="service-repository" address="http://localhost:8181/simple-file-repository/resourceContainer" />
<!--======================================================= -->
<!--========== CAMEL CONTEXT =========== -->
<!--======================================================= -->
<camelContext id="weblabSimpleServicesContext" xmlns="http://camel.apache.org/schema/spring" />
</beans>
\ 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>
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
......@@ -10,70 +10,69 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<groupId>org.ow2.weblab.osgi</groupId>
<artifactId>weblab-camel-chains-karaf</artifactId>
<groupId>org.ow2.weblab.osgi</groupId>
<artifactId>weblab-camel-chains-karaf</artifactId>
<description>Provides feature OSGi for WebLab processing chains.</description>
<description>Provides feature OSGi for WebLab processing chains.</description>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</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.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>1.9.1</version>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>target/classes/features.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
<!-- Force install in local repository to provide it for karaf-weblab project-->
<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>
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
</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.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<executions>
<execution>
<id>attach-artifacts</id>
<phase>package</phase>
<goals>
<goal>attach-artifact</goal>
</goals>
<configuration>
<artifacts>
<artifact>
<file>target/classes/features.xml</file>
<type>xml</type>
<classifier>features</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
<!-- Force install in local repository to provide it for karaf-weblab project -->
<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>
</project>
<?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">
<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>
......@@ -26,19 +25,18 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
<Import-Package>
*,
org.ow2.weblab.core.model;
org.ow2.weblab.core.services;
org.ow2.weblab.engine.camel;
org.apache.camel.component.twitter;resolution:=optional,
org.apache.camel.component.facebook.config;resolution:=optional,
javax.xml.transform;resolution:=optional,
javax.xml.transform.stream;resolution:=optional,
org.ow2.weblab.engine.camel.dataformat.date
*,
org.ow2.weblab.core.model;
org.ow2.weblab.core.services;
org.ow2.weblab.engine.camel;
org.apache.camel.component.twitter;resolution:=optional,
org.apache.camel.component.facebook.config;resolution:=optional,
javax.xml.transform;resolution:=optional,
javax.xml.transform.stream;resolution:=optional,
org.ow2.weblab.engine.camel.dataformat.date
</Import-Package>
</instructions>
</configuration>
......
<?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" >
<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">
<import resource="classpath:routes/Processing.xml" />
<import resource="classpath:routes/WarcConsumingRoutes.xml" />
<import resource="classpath:routes/FileConsumingRoutes.xml" />
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />
<!-- JMS configuration -->
<bean id="jmsConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
<property name="brokerURL" value="tcp://localhost:61616"/>
<property name="userName" value="weblab"/>
<property name="password" value="weblab"/>
<property name="brokerURL" value="tcp://${activemq.host}:${activemq.main.port}" />
<property name="userName" value="weblab" />
<property name="password" value="weblab" />
</bean>
<bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="configuration" ref="jmsConfig" />
</bean>
<bean id="jmsConfig" class="org.apache.camel.component.jms.JmsConfiguration">
<property name="connectionFactory" ref="jmsConnectionFactory"/>
<property name="transactionManager" ref="jmsTransactionManager"/>
<property name="transacted" value="true"/>
<property name="cacheLevelName" value="CACHE_CONNECTION"/>
</bean>
<bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">
<property name="connectionFactory" ref="jmsConnectionFactory" />
</bean>
<bean id="jms" class="org.apache.camel.component.jms.JmsComponent">
<property name="configuration" ref="jmsConfig" />
</bean>
<bean id="jmsConfig" class="org.apache.camel.component.jms.JmsConfiguration">
<property name="connectionFactory" ref="jmsConnectionFactory" />
<property name="transactionManager" ref="jmsTransactionManager" />
<property name="transacted" value="true" />
<property name="cacheLevelName" value="CACHE_CONNECTION" />
</bean>
<bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">
<property name="connectionFactory" ref="jmsConnectionFactory" />
</bean>
<bean id="jetty" class="org.apache.camel.component.jetty8.JettyHttpComponent8" />
<!--======================================================= -->
<!--========== CAMEL CONTEXT =========== -->
......@@ -50,21 +45,30 @@
<routeContextRef ref="warcProcess" />
<routeContextRef ref="fileProcess" />
<endpoint id="files-endpoint" uri="file:${weblab.files}"/>
<endpoint id="warcs-endpoint" uri="file:${weblab.warcs}"/>
<endpoint id="files-endpoint" uri="file:${weblab.files}" />
<endpoint id="warcs-endpoint" uri="file:${weblab.warcs}" />
<!--======================================================= -->
<!--========== DATA FORMATS =========== -->
<!--======================================================= -->
<dataFormats>
<!-- xmlToJson -->
<xmljson id="xmljson" forceTopLevelObject="true" encoding="UTF-8" />
<!-- Weblab jaxb Marshaller -->
<jaxb id="weblabJaxbMarshal" prettyPrint="true"
contextPath="org.ow2.weblab.core.model" partClass="org.ow2.weblab.core.model.Resource"
fragment="true" partNamespace="resource" filterNonXmlChars="false" />
<jaxb id="weblabJaxbMarshal" prettyPrint="true" contextPath="org.ow2.weblab.core.model" partClass="org.ow2.weblab.core.model.Resource" fragment="true" partNamespace="resource"
filterNonXmlChars="false" encoding="UTF-8" />
</dataFormats>
<restConfiguration bindingMode="off" scheme="http" host="localhost" port="8383" >
<camel:dataFormatProperty key="prettyPrint" value="true" />
</restConfiguration>
<rest path="/weblab-rest/">
<post uri="/saveResource" id="/saveResource[POST]" bindingMode="off" type="org.ow2.weblab.core.model.Resource" outType="org.ow2.weblab.core.model.Resource">
<to uri="direct:RestSaveResource" />
</post>
</rest>
</camelContext>
</beans>
<?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:camel="http://camel.apache.org/schema/spring"
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:camel="http://camel.apache.org/schema/spring"
xmlns:cxf="http://camel.apache.org/schema/cxf"
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://camel.apache.org/schema/dataFormats
http://camel.apache.org/schema/spring/camel-spring.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">
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://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">
<!--======================================================= -->
<!--========== ROUTE CONTEXT =========== -->
......@@ -26,10 +19,10 @@
<from uri="jms:queue:weblabdocsin?concurrentConsumers=1" />
<!-- remove previously used webla headers as in JAVA 8 they are sent in CXF calls and ':' cause some issue -->
<removeHeaders pattern="weblab*"/>
<removeHeaders pattern="weblab*" />
<log loggingLevel="INFO" message="New incoming WL resource to process" />
<!-- =================================================================== -->
<!-- EXCEPTION HANDLER -->
......@@ -61,7 +54,7 @@
<constant>true</constant>
</handled>
<log message="Parse exception... moving to error queue" />
<!-- and since this is a unit test we use mock for assertions -->
<to uri="jms:queue:parse-error" />
</onException>
......@@ -76,14 +69,32 @@
<to uri="weblab:analyser:service-ngramj" />
<!-- call Gate service -->
<to uri="weblab:analyser:service-gate" />
<to uri="direct:SaveResource" />