Author: nash
Date: Thu Feb 25 05:52:27 2010
New Revision: 916135
URL: http://svn.apache.org/viewvc?rev=916135&view=rev
Log:
Add ODE runtime database to travel sample binary distro (TUSCANY-3461)
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/ (with
props)
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml?rev=916135&r1=916134&r2=916135&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/contributions/payment-bpel/pom.xml
Thu Feb 25 05:52:27 2010
@@ -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>
Propchange: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 25 05:52:27 2010
@@ -0,0 +1,15 @@
+target
+*.iws
+*.ipr
+*.iml
+.project
+.classpath
+maven.log
+velocity.log*
+junit*.properties
+surefire*.properties
+.settings
+.deployables
+.wtpmodules
+.externalToolBuilders
+maven-eclipse.xml
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml?rev=916135&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
(added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/pom.xml
Thu Feb 25 05:52:27 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml?rev=916135&r1=916134&r2=916135&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml Thu
Feb 25 05:52:27 2010
@@ -34,6 +34,7 @@
<modules>
<module>bundle</module>
<module>jaxws</module>
+ <module>ode</module>
<module>openejb</module>
</modules>
</project>
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml?rev=916135&view=auto
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
(added)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/assembly/bin-ode.xml
Thu Feb 25 05:52:27 2010
@@ -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>
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml?rev=916135&view=auto
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
(added)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-ode.xml
Thu Feb 25 05:52:27 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml?rev=916135&r1=916134&r2=916135&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/build.xml
Thu Feb 25 05:52:27 2010
@@ -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>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml?rev=916135&r1=916134&r2=916135&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
Thu Feb 25 05:52:27 2010
@@ -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>
