Commit 91c5eaad authored by Yann Mombrun's avatar Yann Mombrun

Merge branch 'webservices'

# Conflicts:
#	pom.xml
parents 4a62ebc3 6f3286c9
......@@ -10,12 +10,13 @@
</parent>
<groupId>org.ow2.weblab.services</groupId>
<groupId>org.ow2.weblab.webservices</groupId>
<artifactId>parent</artifactId>
<version>1.2.9-SNAPSHOT</version>
<packaging>pom</packaging>
<name>WebLab Services Parent POM</name>
<name>WebLab WebServices Parent POM</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
......@@ -31,9 +32,74 @@
</properties>
<dependencies>
<!-- WebLabExchangeModel -->
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>extended</artifactId>
</dependency>
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>annotator</artifactId>
</dependency>
<!-- WebServices dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-transports-http</artifactId>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-management</artifactId>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
<dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</dependency>
<dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
<!-- Other External dependencies -->
<!-- TODO add new logging impl -->
<!-- Test dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<!-- Provided dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
<dependencyManagement>
<dependencies>
<!-- WebLab Exchange Model -->
<!-- WebLab Core -->
<dependency>
<groupId>org.ow2.weblab.core</groupId>
<artifactId>model</artifactId>
......@@ -66,6 +132,14 @@
</dependency>
<!-- WebLab Component -->
<dependency>
<groupId>org.ow2.weblab.components</groupId>
<artifactId>content-manager</artifactId>
<version>2.3.0-SNAPSHOT</version>
</dependency>
<!-- Spring dependencies -->
<dependency>
<groupId>org.springframework</groupId>
......@@ -189,14 +263,63 @@
<artifactId>solr-solrj</artifactId>
<version>${solr.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>3.1.0</version>
<scope>provided</scope>
</dependency>
</dependencies>
</dependencyManagement>
<description>This is a generic parent for services (components, portlet or webservices) developed for the WebLab platform.</description>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<!-- only class files are included into jar files -->
<includes>
<include>**/*.class</include>
</includes>
<finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
</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/${project.artifactId}-${project.version}.jar</file>
<type>jar</type>
<classifier>jar</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<repositories>
......@@ -235,64 +358,4 @@
</repository>
</repositories>
<!-- specific profile that is used to package class files also in a jar during install phase of WEB projects (using jar classifier), to have a war + a jar at the end. Jar could then be used as dependency
in other projects, especially projects that need to oeverride (or simply add) some code on to of a webservice or portlet -->
<profiles>
<profile>
<id>generate-jar</id>
<!-- this work will be done only if a src/main/webapp directory exist (not for parent pom for example) -->
<activation>
<file>
<exists>src/main/webapp</exists>
</file>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<executions>
<execution>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<!-- only class files are included into jar files -->
<includes>
<include>**/*.class</include>
</includes>
<finalName>${project.artifactId}-${project.version}</finalName>
</configuration>
</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/${project.artifactId}-${project.version}.jar</file>
<type>jar</type>
<classifier>jar</classifier>
</artifact>
</artifacts>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
Markdown is supported
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