Author: ivol37 at gmail.com
Date: Wed Nov 10 11:43:30 2010
New Revision: 331
Log:
[AMDATU-129] Ongoing Refactoring/moving of SVN layout
Added:
trunk/amdatu-web/rest-jaxrs/pom.xml
Modified:
trunk/amdatu-web/pom.xml
trunk/amdatu-web/rest-wink/pom.xml
Modified: trunk/amdatu-web/pom.xml
==============================================================================
--- trunk/amdatu-web/pom.xml (original)
+++ trunk/amdatu-web/pom.xml Wed Nov 10 11:43:30 2010
@@ -15,6 +15,7 @@
<modules>
<module>jsp-support</module>
<module>httpcontext</module>
+ <module>rest-jaxrs</module>
<module>rest-wink</module>
</modules>
Added: trunk/amdatu-web/rest-jaxrs/pom.xml
==============================================================================
--- (empty file)
+++ trunk/amdatu-web/rest-jaxrs/pom.xml Wed Nov 10 11:43:30 2010
@@ -0,0 +1,52 @@
+<?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.amdatu</groupId>
+ <artifactId>org.amdatu.web</artifactId>
+ <version>0.0.6-SNAPSHOT</version>
+ </parent>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>jaxrs</artifactId>
+ <packaging>bundle</packaging>
+ <name>Amdatu Web - JAX RS</name>
+ <description>Embeds the JAX RS libraries for REST support</description>
+
+ <dependencies>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>jsr311-api</artifactId>
+ <version>${jsr311-api.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+
<Bundle-SymbolicName>org.amdatu.web.rest.jaxrs</Bundle-SymbolicName>
+ <Embed-Dependency>*;scope=compile</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ *;resolution:=optional
+ </Import-Package>
+ <_exportcontents>
+ javax.ws.rs.*;version=${jsr311-api.version}
+ </_exportcontents>
+ </instructions>
+ </configuration>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+
+ </build>
+</project>
Modified: trunk/amdatu-web/rest-wink/pom.xml
==============================================================================
--- trunk/amdatu-web/rest-wink/pom.xml (original)
+++ trunk/amdatu-web/rest-wink/pom.xml Wed Nov 10 11:43:30 2010
@@ -27,10 +27,11 @@
<scope>compile</scope>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>jsr311-api</artifactId>
- <version>${jsr311-api.version}</version>
- <scope>compile</scope>
+ <groupId>org.amdatu.web.rest</groupId>
+ <artifactId>jaxrs</artifactId>
+ <version>${platform.version}</version>
+ <type>bundle</type>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.wink</groupId>
@@ -61,7 +62,6 @@
*;resolution:=optional
</Import-Package>
<_exportcontents>
- javax.ws.rs.*;version=${jsr311-api.version},
org.apache.wink.server.utils,
org.apache.wink.common.model.app;version=1.1,
org.apache.wink.common.model.synd;version=1.1
