Commit e29c1feb authored by Yann Mombrun's avatar Yann Mombrun
Browse files

WEBLAB-253 Start migrating the bundle to 1.2.5

git-svn-id: svn://svn.forge.objectweb.org/svnroot/weblab/trunk/WebLabApplications/bundle@2795 a803c184-d8de-4a0e-a52b-d3eef88212b6
parent 268e064e
......@@ -2,7 +2,7 @@
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>1.2.2.1</id>
<id>1.2.5</id>
<formats>
<format>zip</format>
</formats>
......@@ -140,10 +140,9 @@
<unpackOptions>
<excludes>
<exclude>WEB-INF/classes/services_configuration.xml</exclude>
<exclude>WEB-INF/lib/model-1.2.2*</exclude>
<exclude>WEB-INF/lib/extended-1.2.2*</exclude>
<exclude>WEB-INF/lib/annotator-1.2.*</exclude>
<exclude>WEB-INF/lib/dataoperator-*</exclude>
<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/log4j-*</exclude>
<exclude>WEB-INF/lib/commons-io-*</exclude>
<exclude>WEB-INF/lib/commons-logging-*</exclude>
......@@ -153,14 +152,13 @@
<exclude>WEB-INF/lib/cxf-*</exclude>
<exclude>WEB-INF/lib/aopalliance-*</exclude>
<exclude>WEB-INF/lib/spring-*</exclude>
<exclude>WEB-INF/lib/jena-2.6.4*</exclude>
<exclude>WEB-INF/lib/jena*</exclude>
<exclude>WEB-INF/lib/wsdl4j*</exclude>
<exclude>WEB-INF/lib/neethi*</exclude>
<exclude>WEB-INF/lib/rdf-helper-jena*</exclude>
<exclude>WEB-INF/lib/iri-*</exclude>
<exclude>WEB-INF/lib/iri*</exclude>
<exclude>WEB-INF/lib/stax2-api-*</exclude>
<exclude>WEB-INF/lib/xml-resolver-*</exclude>
<exclude>WEB-INF/lib/icu4j-*</exclude>
<exclude>WEB-INF/lib/asm-*</exclude>
<exclude>WEB-INF/lib/jaxb-impl-*</exclude>
<exclude>WEB-INF/lib/xml-apis-*</exclude>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle</groupId>
<artifactId>versions</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......@@ -19,7 +19,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<version>${maven.assembly-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
......
<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.bundle</groupId>
<artifactId>versions</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......@@ -27,48 +26,48 @@
</modules>
<dependencies>
<!-- Common libraries -->
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
<version>${weblab.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>extended</artifactId>
<version>${weblab.version}</version>
<type>jar</type>
</dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
<version>${weblab.model.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>extended</artifactId>
<version>${weblab.extended.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>${weblab.annotator.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena</artifactId>
<version>${weblab.rdf-helper-jena.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-selection</artifactId>
<version>${weblab.rdf-helper-jena-selection.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>${annotator.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena</artifactId>
<version>1.3.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-selection</artifactId>
<version>1.5.3</version>
<artifactId>rdf-helper-jena-structure</artifactId>
<version>${weblab.rdf-helper-jena-structure.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.services</groupId>
<artifactId>dataoperator</artifactId>
<version>${weblab.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.portlets</groupId>
<artifactId>weblab-portlet</artifactId>
<version>${weblab.portlet.version}</version>
<version>${weblab.weblab-portlet.version}</version>
<type>jar</type>
</dependency>
<dependency>
......@@ -105,31 +104,31 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
<type>jar</type>
<type>jar</type>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
<type>jar</type>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>${icu4j.version}</version>
<type>jar</type>
<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>
<type>jar</type>
</dependency>
<dependency>
<groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${taglib.version}</version>
<type>jar</type>
<type>jar</type>
</dependency>
<dependency>
<groupId>jstl</groupId>
......@@ -138,7 +137,7 @@
<type>jar</type>
</dependency>
</dependencies>
</dependencies>
<build>
<finalName>portlets</finalName>
......@@ -146,7 +145,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<version>${maven.assembly-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
......@@ -174,30 +173,29 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
</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>
</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>
......@@ -14,10 +14,10 @@
<unpack>true</unpack>
<unpackOptions>
<excludes>
<exclude>WEB-INF/lib/model-1.2.2*</exclude>
<exclude>WEB-INF/lib/extended-1.2.2*</exclude>
<exclude>WEB-INF/lib/annotator-1.2.*</exclude>
<exclude>WEB-INF/lib/dataoperator-*</exclude>
<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/log4j-*</exclude>
<exclude>WEB-INF/lib/commons-io-*</exclude>
<exclude>WEB-INF/lib/commons-logging-*</exclude>
......@@ -25,7 +25,7 @@
<exclude>WEB-INF/lib/joda-time-*</exclude>
<exclude>WEB-INF/lib/xalan-*</exclude>
<exclude>WEB-INF/lib/spring-*</exclude>
<exclude>WEB-INF/lib/jena-2.6.4*</exclude>
<exclude>WEB-INF/lib/jena-2*</exclude>
<exclude>WEB-INF/lib/rdf-helper-jena*</exclude>
<exclude>WEB-INF/lib/iri-*</exclude>
<exclude>WEB-INF/lib/stax2-api-*</exclude>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
......
......@@ -5,7 +5,7 @@
<parent>
<groupId>org.ow2.weblab.bundle.portlet</groupId>
<artifactId>parent-portlets</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../parent-portlets.xml</relativePath>
</parent>
......
<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.bundle</groupId>
<artifactId>versions</artifactId>
<version>1.2.2.1-SNAPSHOT</version>
<version>1.2.5-SNAPSHOT</version>
<relativePath>../../versions/pom.xml</relativePath>
</parent>
......@@ -16,44 +15,44 @@
<name>WebLab Services libs assembly.</name>
<description>WebLab Services libs.</description>
<dependencies>
<!-- Common libraries -->
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
<version>${weblab.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>extended</artifactId>
<version>${weblab.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>${annotator.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena</artifactId>
<version>1.3.2</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-selection</artifactId>
<version>1.5.3</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.services</groupId>
<artifactId>dataoperator</artifactId>
<version>${weblab.version}</version>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
<version>${weblab.model.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>extended</artifactId>
<version>${weblab.extended.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
<version>${weblab.annotator.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena</artifactId>
<version>${weblab.rdf-helper-jena.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-selection</artifactId>
<version>${weblab.rdf-helper-jena-selection.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core.helpers</groupId>
<artifactId>rdf-helper-jena-structure</artifactId>
<version>${weblab.rdf-helper-jena-structure.version}</version>
<type>jar</type>
</dependency>
<dependency>
......@@ -90,7 +89,7 @@
<groupId>joda-time</groupId>
<artifactId>joda-time</artifactId>
<version>${joda-time.version}</version>
<type>jar</type>
<type>jar</type>
</dependency>
<!-- Common libraries to copy into Tomcat -->
......@@ -98,29 +97,65 @@
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
<type>jar</type>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
<type>jar</type>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
<version>${cxf.version}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
<type>jar</type>
<type>jar</type>
</dependency>
<dependency>
<groupId>com.ibm.icu</groupId>
<artifactId>icu4j</artifactId>
<version>${icu4j.version}</version>
<type>jar</type>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>${xml-apis.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
<type>jar</type>
</dependency>
</dependencies>
<build>
......@@ -129,7 +164,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.3</version>
<version>${maven.assembly-plugin.version}</version>
<executions>
<execution>
<phase>package</phase>
......@@ -157,30 +192,29 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
</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>
</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>
\ 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>