From cd56dabae8c2297c3f71c1dfa5ef406e60c6c406 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 10 Feb 2010 09:56:55 +0000
Subject: Add scatours-launcher-payment-bpel to the travel sample distribution
 (TUSCANY-3460)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@908421 13f79535-47bb-0310-9956-ffa450edef68
---
 .../tutorials/travelsample/distribution/pom.xml    |  5 ++
 .../src/main/components/bin-modules.xml            |  8 +++
 .../launchers/notification-ejb/pom.xml             |  9 +--
 .../travelsample/launchers/payment-bpel/pom.xml    | 17 +++++
 .../travelsample/services/smsgateway-ejb/pom.xml   | 61 +++-------------
 .../travelsample/util/openejb-runtime/pom.xml      | 84 ++++++++++++++++++++++
 .../trunk/tutorials/travelsample/util/pom.xml      |  1 +
 7 files changed, 129 insertions(+), 56 deletions(-)
 create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml

(limited to 'sca-java-1.x/trunk/tutorials/travelsample')

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
index d38dd4090f..bb23dc6558 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
@@ -434,6 +434,11 @@
             <artifactId>scatours-launcher-notification-ws</artifactId>
             <version>${pom.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-launcher-payment-bpel</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
             <artifactId>scatours-launcher-payment-groovy</artifactId>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
index b08d7beab4..9d4e00c2da 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
@@ -27,6 +27,14 @@
             </includes>
         </fileSet>
 
+        <fileSet>
+            <directory>../util/openejb-runtime/target</directory>
+            <outputDirectory>util</outputDirectory>
+            <includes>
+                <include>scatours-util-openejb-runtime.jar</include>
+            </includes>
+        </fileSet>
+
     </fileSets>
 
     <dependencySets>
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 06cd88f2fd..84ec159a3f 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,9 +72,10 @@
         </dependency> 
 
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-ejbd</artifactId>
-            <version>3.1.1</version>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-util-openejb-runtime</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -95,7 +96,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+                            <Class-Path>../util/scatours-util-launcher-common.jar ../util/scatours-util-openejb-runtime.jar</Class-Path>
                         </manifestEntries>
                         <manifest>
                             <addClasspath>true</addClasspath>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
index 303003ae7a..272e19f56c 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
@@ -63,6 +63,23 @@
             <version>${tuscany.version}</version>
             <scope>runtime</scope>
         </dependency>        
+
+        <!-- Replace commons-logging-1.0.4 brought in by tuscany-implementation-bpel-ode --> 
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.1.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.servlet</groupId>
+                    <artifactId>servlet-api</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>avalon-framework</groupId>
+                    <artifactId>avalon-framework</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         
         <dependency>
             <groupId>org.apache.tuscany.sca</groupId>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
index cfdc22fae8..fe4788bcde 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
@@ -29,53 +29,11 @@
     <name>Apache Tuscany SCA Tours SMS Gateway EJB Service</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>javaee-api</artifactId>
-            <version>5.0-2</version>
-        </dependency>
-
-        <dependency>
-            <groupId>log4j</groupId>
-            <artifactId>log4j</artifactId>
-            <version>1.2.13</version>
-            <scope>runtime</scope>
-        </dependency>
-
-         <dependency>
-             <groupId>wsdl4j</groupId>
-             <artifactId>wsdl4j</artifactId>
-             <version>1.6.2</version>
-         </dependency>
-
-        <dependency>
-            <groupId>commons-logging</groupId>
-            <artifactId>commons-logging</artifactId>
-            <version>1.1.1</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>javax.servlet</groupId>
-                    <artifactId>servlet-api</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>avalon-framework</groupId>
-                    <artifactId>avalon-framework</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-core</artifactId>
-            <version>3.1.1</version>
-            <scope>runtime</scope>
-        </dependency>
-
         <dependency>
-            <groupId>org.apache.openejb</groupId>
-            <artifactId>openejb-ejbd</artifactId>
-            <version>3.1.1</version>
-            <scope>runtime</scope>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>scatours-util-openejb-runtime</artifactId>
+            <version>${pom.version}</version>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
     
@@ -88,14 +46,13 @@
                 <version>2.2</version>
                 <configuration>
                     <archive>
-                        <manifest>
-                            <addClasspath>true</addClasspath>
-                            <classpathPrefix>../lib/</classpathPrefix>
-                            <mainClass>com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap</mainClass>
-                        </manifest>
+                        <manifestEntries>
+                            <Class-Path>../util/scatours-util-openejb-runtime.jar</Class-Path>
+                            <Main-Class>com.tuscanyscatours.smsgateway.SMSGatewayEJBServiceBootstrap</Main-Class>
+                        </manifestEntries>
                     </archive>
                 </configuration>
             </plugin>
         </plugins>                 
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
new file mode 100644
index 0000000000..d8ce5913df
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * Licensed to the Apache Software Foundation (ASF) under one
+    * or more contributor license agreements.  See the NOTICE file
+    * distributed with this work for additional information
+    * regarding copyright ownership.  The ASF licenses this file
+    * to you under the Apache License, Version 2.0 (the
+    * "License"); you may not use this file except in compliance
+    * with the License.  You may obtain a copy of the License at
+    * 
+    *   http://www.apache.org/licenses/LICENSE-2.0
+    * 
+    * Unless required by applicable law or agreed to in writing,
+    * software distributed under the License is distributed on an
+    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    * KIND, either express or implied.  See the License for the
+    * specific language governing permissions and limitations
+    * under the License.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>scatours</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent><version>1.0-SNAPSHOT</version>
+    <artifactId>scatours-util-openejb-runtime</artifactId>
+    <name>Apache Tuscany SCA Tours OpenEJB Runtime Dependencies</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.openejb</groupId>
+            <artifactId>openejb-ejbd</artifactId>
+            <version>${env.OPENEJB_VERSION}</version>
+            <scope>runtime</scope>
+        </dependency>
+    </dependencies>
+
+    <profiles>
+        <profile>
+            <id>windows</id>
+            <activation>
+                <os>
+                    <family>windows</family>
+                </os>
+            </activation>
+            <properties>
+                <manifest.classpath.prefix>/</manifest.classpath.prefix>
+            </properties>
+        </profile>
+        <profile>
+            <id>unix</id>
+            <activation>
+                <os>
+                    <family>unix</family>
+                </os>
+            </activation>
+            <properties>
+                <manifest.classpath.prefix></manifest.classpath.prefix>
+            </properties>
+        </profile>
+    </profiles>
+
+    <build>
+        <finalName>${artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <addClasspath>true</addClasspath>
+                            <classpathPrefix>${manifest.classpath.prefix}${env.OPENEJB_HOME}/lib/</classpathPrefix>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>       
+    </build>
+
+</project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml
index 265803644c..60d2a08ba9 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml
@@ -38,6 +38,7 @@
             </activation>
             <modules>
                 <module>launcher-common</module>
+                <module>openejb-runtime</module>
             </modules>
         </profile>
     </profiles>
-- 
cgit v1.2.3