From 9a3408f7df9d48acb2f6c49bbd62ef7373f2c547 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 29 May 2010 20:27:51 +0000
Subject: 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@949438 13f79535-47bb-0310-9956-ffa450edef68
---
 .../launchers/notification-ejb/pom.xml             | 30 +++++++-
 .../sca-java-travelsample-1.0/launchers/pom.xml    | 85 ++++++++++------------
 2 files changed, 67 insertions(+), 48 deletions(-)

(limited to 'sca-java-1.x/branches/sca-java-travelsample-1.0/launchers')

diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/pom.xml
index a70f7b2556..c1ce939e10 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/notification-ejb/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/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>
diff --git a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/pom.xml b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/pom.xml
index 8df7db17cc..1e4e23c717 100644
--- a/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/pom.xml
+++ b/sca-java-1.x/branches/sca-java-travelsample-1.0/launchers/pom.xml
@@ -29,52 +29,43 @@
     <packaging>pom</packaging>
     <name>Apache Tuscany SCA Tours Launchers</name>
 
-    <profiles>
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <modules>
-                <module>blog-feed</module>
-                <module>buildingblocks</module>
-                <module>currency-converter</module>
-                <module>currency-converter-corba</module>
-                <module>currency-converter-jms</module>
-                <module>currency-converter-rmi</module>
-                <module>currency-converter-ws</module>
-                <module>databinding</module>
-                <module>feed-logger</module>
-                <module>interaction</module>
-                <module>introducing</module>
-                <module>introducing-client</module>
-                <module>introducing-domain</module>
-                <module>introducing-tours</module>
-                <module>introducing-trips</module>
-                <module>jumpstart</module>
-                <module>fullapp</module>
-                <module>fullapp-domain</module>
-                <module>fullapp-nodes</module>
-                <module>help-pages</module>
-                <module>notification-ws</module>
-                <module>notification-corba</module>
-                <module>notification-ejb</module>
-                <module>notification-jms</module>
-                <module>notification-rmi</module>
-                <module>payment-java</module>
-                <module>payment-java-callback</module>
-                <module>payment-java-policy</module>
-                <module>payment-java-reference-pass</module>
-                <module>payment-spring</module>
-                <module>payment-spring-scatag</module>
-                <module>payment-bpel</module>
-                <module>payment-groovy</module>
-                <module>payment-python</module>
-                <module>policy</module>
-                <module>usingsca</module>
-            </modules>
-        </profile>
-
-    </profiles>
+    <modules>
+        <module>blog-feed</module>
+        <module>buildingblocks</module>
+        <module>currency-converter</module>
+        <module>currency-converter-corba</module>
+        <module>currency-converter-jms</module>
+        <module>currency-converter-rmi</module>
+        <module>currency-converter-ws</module>
+        <module>databinding</module>
+        <module>feed-logger</module>
+        <module>interaction</module>
+        <module>introducing</module>
+        <module>introducing-client</module>
+        <module>introducing-domain</module>
+        <module>introducing-tours</module>
+        <module>introducing-trips</module>
+        <module>jumpstart</module>
+        <module>fullapp</module>
+        <module>fullapp-domain</module>
+        <module>fullapp-nodes</module>
+        <module>help-pages</module>
+        <module>notification-ws</module>
+        <module>notification-corba</module>
+        <module>notification-ejb</module>
+        <module>notification-jms</module>
+        <module>notification-rmi</module>
+        <module>payment-java</module>
+        <module>payment-java-callback</module>
+        <module>payment-java-policy</module>
+        <module>payment-java-reference-pass</module>
+        <module>payment-spring</module>
+        <module>payment-spring-scatag</module>
+        <module>payment-bpel</module>
+        <module>payment-groovy</module>
+        <module>payment-python</module>
+        <module>policy</module>
+        <module>usingsca</module>
+    </modules>
 
 </project>
-- 
cgit v1.2.3