diff options
author | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-29 20:30:28 +0000 |
---|---|---|
committer | nash <nash@13f79535-47bb-0310-9956-ffa450edef68> | 2010-05-29 20:30:28 +0000 |
commit | 3cdc93215b4b0be782060438eec8c20b9c5152ce (patch) | |
tree | c52ea3f1072bba4b1e068d32aaa60e69d2fcdb71 /sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml | |
parent | 9a3408f7df9d48acb2f6c49bbd62ef7373f2c547 (diff) |
Remove openejb-runtime dependency from notification-ejb launcher when using the default profile, and clean up profile handling in the travel sample poms (TUSCANY-3578)
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@949439 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r-- | sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml index a70f7b2556..c1ce939e10 100644 --- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml +++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml @@ -72,6 +72,34 @@ </dependency>
</dependencies>
+ <profiles>
+ <profile>
+ <!-- The default profile produces a subset distribution which excludes
+ libraries that are present in the Tuscany SCA binary distro. -->
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <!-- Avoid adding OpenEJB jars because they include the wrong level of JAXB API.
+ The runtime ant script adds OpenEJB jars at the right place in the classpath. -->
+ <openejb-runtime/>
+ </properties>
+ </profile>
+
+ <profile>
+ <!-- Use mvn -Pselfcontained to produce a self-contained distribution
+ with all library dependencies included. -->
+ <id>selfcontained</id>
+ <properties>
+ <!-- Include the OpenEJB jars because there's no ant script to provide them.
+ We get the correct level of JAXB API because the ../lib jars take priority. -->
+ <openejb-runtime>../util/scatours-util-openejb-runtime.jar</openejb-runtime>
+ </properties>
+ </profile>
+ </profiles>
+
+
<build>
<finalName>${artifactId}</finalName>
<plugins>
@@ -82,7 +110,7 @@ <configuration>
<archive>
<manifestEntries>
- <Class-Path>../util/scatours-util-launcher-common.jar ../util/scatours-util-openejb-runtime.jar</Class-Path>
+ <Class-Path>../util/scatours-util-launcher-common.jar ${openejb-runtime}</Class-Path>
</manifestEntries>
<manifest>
<addClasspath>${scatours.selfContained}</addClasspath>
|