You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by na...@apache.org on 2010/02/10 10:56:56 UTC
svn commit: r908421 - in /tuscany/sca-java-1.x/trunk/tutorials/travelsample:
distribution/ distribution/src/main/components/ launchers/notification-ejb/
launchers/payment-bpel/ services/smsgateway-ejb/ util/ util/openejb-runtime/
Author: nash
Date: Wed Feb 10 09:56:55 2010
New Revision: 908421
URL: http://svn.apache.org/viewvc?rev=908421&view=rev
Log:
Add scatours-launcher-payment-bpel to the travel sample distribution (TUSCANY-3460)
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/ (with props)
tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/payment-bpel/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml
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=908421&r1=908420&r2=908421&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 Wed Feb 10 09:56:55 2010
@@ -436,6 +436,11 @@
</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>
<version>${pom.version}</version>
</dependency>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml?rev=908421&r1=908420&r2=908421&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/main/components/bin-modules.xml Wed Feb 10 09:56:55 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml?rev=908421&r1=908420&r2=908421&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/launchers/notification-ejb/pom.xml Wed Feb 10 09:56:55 2010
@@ -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>
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=908421&r1=908420&r2=908421&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 Wed Feb 10 09:56:55 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml?rev=908421&r1=908420&r2=908421&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/services/smsgateway-ejb/pom.xml Wed Feb 10 09:56:55 2010
@@ -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>
Propchange: tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Feb 10 09:56:55 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/util/openejb-runtime/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml?rev=908421&view=auto
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml (added)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/openejb-runtime/pom.xml Wed Feb 10 09:56:55 2010
@@ -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>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml?rev=908421&r1=908420&r2=908421&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml (original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/util/pom.xml Wed Feb 10 09:56:55 2010
@@ -38,6 +38,7 @@
</activation>
<modules>
<module>launcher-common</module>
+ <module>openejb-runtime</module>
</modules>
</profile>
</profiles>