From e21c17e0b66d2b7768ec22fa69b55aea8c37a5d8 Mon Sep 17 00:00:00 2001
From: nash <nash@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 25 Feb 2010 05:52:27 +0000
Subject: Add ODE runtime database to travel sample binary distro
 (TUSCANY-3461)

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@916135 13f79535-47bb-0310-9956-ffa450edef68
---
 .../contributions/payment-bpel/pom.xml             |  4 +-
 .../travelsample/distribution/ode/pom.xml          | 73 ++++++++++++++++++++++
 .../tutorials/travelsample/distribution/pom.xml    |  1 +
 .../distribution/src/main/assembly/bin-ode.xml     | 36 +++++++++++
 .../distribution/src/main/components/bin-ode.xml   | 36 +++++++++++
 .../travelsample/launchers/payment-bpel/build.xml  |  6 ++
 .../travelsample/launchers/payment-bpel/pom.xml    | 27 +-------
 7 files changed, 155 insertions(+), 28 deletions(-)
 create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
 create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
 create mode 100644 sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml

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

diff --git a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
index 1d062cd68d..3cf859b5eb 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
@@ -206,10 +206,10 @@
                             <artifactItem>
                                 <groupId>org.apache.ode</groupId>
                                 <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-                                <version>1.1</version>
+                                <version>1.1.1</version>
                                 <type>zip</type>
                                 <overWrite>true</overWrite>
-                                <outputDirectory>${project.build.directory}/classes/</outputDirectory>
+                                <outputDirectory>${project.build.directory}/test-classes/</outputDirectory>
                             </artifactItem>
                         </artifactItems>
                     </configuration>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
new file mode 100644
index 0000000000..4641976fba
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
@@ -0,0 +1,73 @@
+<?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>
+
+    <!-- This module brings in the database needed by the ODE runtime. -->
+    <artifactId>scatours-distribution-ode</artifactId>
+    <name>Apache Tuscany SCA Tours Distribution ODE Database</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.ode</groupId>
+            <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
+            <type>zip</type>
+            <version>1.1.1</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>distribution-package</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>../target</outputDirectory>
+                            <descriptors>
+                                <descriptor>../src/main/assembly/bin-ode.xml</descriptor>
+                            </descriptors>
+                            <tarLongFileMode>gnu</tarLongFileMode>
+                            <archiveBaseDirectory>..</archiveBaseDirectory>
+                            <outputDirectory>../target</outputDirectory>
+                            <finalName>apache-tuscany-scatours-${version}</finalName>
+                            <appendAssemblyId>true</appendAssemblyId>
+                            <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
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 461f08cdb2..cf87578add 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
@@ -34,6 +34,7 @@
     <modules>
         <module>bundle</module>
         <module>jaxws</module>
+        <module>ode</module>
         <module>openejb</module>
     </modules>
 </project>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
new file mode 100644
index 0000000000..1965c7f16e
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
@@ -0,0 +1,36 @@
+<?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.
+-->
+<assembly>
+    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+    <id></id>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>tuscany-scatours-${version}</baseDirectory>
+    <formats>
+        <format>dir</format>
+<!--
+        <format>tar.gz</format>
+        <format>zip</format>
+-->
+    </formats>
+
+    <componentDescriptors>
+        <componentDescriptor>../src/main/components/bin-ode.xml</componentDescriptor>
+    </componentDescriptors>
+</assembly>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
new file mode 100644
index 0000000000..884a8fdb84
--- /dev/null
+++ b/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
@@ -0,0 +1,36 @@
+<!--
+    * 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.
+-->
+<component>
+
+    <dependencySets>
+        <!-- Add the ODE database to the ode directory -->
+        <dependencySet>
+            <useProjectArtifact>false</useProjectArtifact>
+            <outputDirectory>ode</outputDirectory>
+            <unpack>true</unpack>
+            <!--
+            <includes>
+                <include>org.apache.ode:ode-dao-jpa-ojpa-derby-*</include>
+            </includes>
+            -->
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+
+</component>
diff --git a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
index 8e3156e8b7..f9d839c17e 100644
--- a/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
+++ b/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
@@ -24,9 +24,15 @@
     </path>
 
     <target name="run">
+        <unzip dest="target/ode">
+            <fileset dir="${env.TUSCANY_HOME}/lib">
+                <include name="ode-dao-jpa-ojpa-derby-*.zip"/>
+            </fileset>
+        </unzip>
         <java classname="scatours.payment.PaymentLauncher" fork="true" failonerror="true">
             <classpath>
                 <pathelement location="target/${ant.project.name}.jar"/>
+                <pathelement location="target/ode"/>
                 <path refid="compile-path"/>
                 <pathelement location="${env.TUSCANY_HOME}/lib/tuscany-sca-manifest.jar"/>
             </classpath>
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 0483766f74..498ee1eb53 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
@@ -131,7 +131,7 @@
                 <configuration>
                     <archive>
                         <manifestEntries>
-                            <Class-Path>../util/scatours-util-launcher-common.jar</Class-Path>
+                            <Class-Path>../util/scatours-util-launcher-common.jar ../ode/</Class-Path>
                         </manifestEntries>
                         <manifest>
                             <addClasspath>${scatours.selfContained}</addClasspath>
@@ -141,31 +141,6 @@
                     </archive>
                 </configuration>
             </plugin>
-	        <plugin>
-	            <groupId>org.apache.maven.plugins</groupId>
-	            <artifactId>maven-dependency-plugin</artifactId>
-	            <executions>
-	                <execution>
-	                    <id>unpack</id>
-	                    <phase>test-compile</phase>
-	                    <goals>
-	                        <goal>unpack</goal>
-	                    </goals>
-	                    <configuration>
-	                        <artifactItems>
-	                            <artifactItem>
-	                                <groupId>org.apache.ode</groupId>
-	                                <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
-	                                <version>1.1</version>
-	                                <type>zip</type>
-	                                <overWrite>true</overWrite>
-	                                <outputDirectory>${project.build.directory}/classes/</outputDirectory>
-	                            </artifactItem>
-	                        </artifactItems>
-	                    </configuration>
-	                </execution>
-	            </executions>
-	        </plugin>                 
         </plugins>              
     </build>
 </project>
-- 
cgit v1.2.3