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@949439 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
nash
parent
9a3408f7df
commit
3cdc93215b
8 changed files with 197 additions and 248 deletions
|
|
@ -570,6 +570,29 @@
|
|||
</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>
|
||||
<config-file>bin.xml</config-file>
|
||||
</properties>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<!-- Use mvn -Pselfcontained to produce a self-contained distribution
|
||||
with all library dependencies included. -->
|
||||
<id>selfcontained</id>
|
||||
<properties>
|
||||
<config-file>bin-selfcontained.xml</config-file>
|
||||
</properties>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
|
|
@ -588,80 +611,31 @@
|
|||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
<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>
|
||||
<descriptors>
|
||||
<descriptor>../src/main/assembly/${config-file}</descriptor>
|
||||
</descriptors>
|
||||
<tarLongFileMode>gnu</tarLongFileMode>
|
||||
<archiveBaseDirectory>..</archiveBaseDirectory>
|
||||
<outputDirectory>../target</outputDirectory>
|
||||
<finalName>.</finalName>
|
||||
<appendAssemblyId>true</appendAssemblyId>
|
||||
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<!-- The default profile produces a subset binaries package which excludes
|
||||
libraries that are present in the Tuscany SCA binary distro. -->
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<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>
|
||||
<descriptors>
|
||||
<descriptor>../src/main/assembly/bin.xml</descriptor>
|
||||
</descriptors>
|
||||
<tarLongFileMode>gnu</tarLongFileMode>
|
||||
<archiveBaseDirectory>..</archiveBaseDirectory>
|
||||
<outputDirectory>../target</outputDirectory>
|
||||
<finalName>.</finalName>
|
||||
<appendAssemblyId>true</appendAssemblyId>
|
||||
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
|
||||
<profile>
|
||||
<!-- Use mvn -Pselfcontained to produce a self-contained binaries package
|
||||
with all library dependencies included. -->
|
||||
<id>selfcontained</id>
|
||||
<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>
|
||||
<descriptors>
|
||||
<descriptor>../src/main/assembly/bin-selfcontained.xml</descriptor>
|
||||
</descriptors>
|
||||
<tarLongFileMode>gnu</tarLongFileMode>
|
||||
<archiveBaseDirectory>..</archiveBaseDirectory>
|
||||
<outputDirectory>../target</outputDirectory>
|
||||
<finalName>.</finalName>
|
||||
<appendAssemblyId>true</appendAssemblyId>
|
||||
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -29,20 +29,11 @@
|
|||
<packaging>pom</packaging>
|
||||
<name>Apache Tuscany SCA Tours non-SCA Clients</name>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>currency-converter-corba</module>
|
||||
<module>currency-converter-jms</module>
|
||||
<module>currency-converter-rmi</module>
|
||||
<module>currency-converter-ws-jaxws</module>
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
<modules>
|
||||
<module>currency-converter-corba</module>
|
||||
<module>currency-converter-jms</module>
|
||||
<module>currency-converter-rmi</module>
|
||||
<module>currency-converter-ws-jaxws</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -29,75 +29,66 @@
|
|||
<packaging>pom</packaging>
|
||||
<name>Apache Tuscany SCA Tours Contributions</name>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>blog-feed</module>
|
||||
<module>buildingblocks</module>
|
||||
<module>buildingblocks-client</module>
|
||||
<module>calendar</module>
|
||||
<module>car</module>
|
||||
<module>common</module>
|
||||
<module>creditcard-payment-jaxb</module>
|
||||
<module>creditcard-payment-jaxb-policy</module>
|
||||
<module>creditcard-payment-sdo</module>
|
||||
<module>creditcard-payment-webapp</module>
|
||||
<module>currency</module>
|
||||
<module>currency-corba</module>
|
||||
<module>currency-jms</module>
|
||||
<module>currency-jsp</module>
|
||||
<module>currency-rmi</module>
|
||||
<module>currency-servlet</module>
|
||||
<module>currency-ws</module>
|
||||
<module>databinding-client</module>
|
||||
<module>emailgateway</module>
|
||||
<module>feed-logger</module>
|
||||
<module>flight</module>
|
||||
<module>fullapp-ui</module>
|
||||
<module>fullapp-coordination</module>
|
||||
<module>fullapp-currency</module>
|
||||
<module>fullapp-packagedtrip</module>
|
||||
<module>fullapp-bespoketrip</module>
|
||||
<module>fullapp-shoppingcart</module>
|
||||
<module>help-pages</module>
|
||||
<module>hotel</module>
|
||||
<module>interaction-client</module>
|
||||
<module>interaction-service-remote</module>
|
||||
<module>introducing-client</module>
|
||||
<module>introducing-tours</module>
|
||||
<module>introducing-trips</module>
|
||||
<module>notification</module>
|
||||
<module>notification-ws</module>
|
||||
<module>notification-corba</module>
|
||||
<module>notification-ejb</module>
|
||||
<module>notification-jms</module>
|
||||
<module>notification-rmi</module>
|
||||
<module>shoppingcart</module>
|
||||
<module>travelcatalog</module>
|
||||
<module>tripbooking</module>
|
||||
<module>trip</module>
|
||||
<module>scatours</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-policy</module>
|
||||
<module>payment-spring-scatag</module>
|
||||
<module>payment-bpel-process</module>
|
||||
<module>payment-bpel</module>
|
||||
<module>payment-groovy</module>
|
||||
<module>payment-python</module>
|
||||
<module>policy-client</module>
|
||||
<module>trip-policy</module>
|
||||
<module>usingsca</module>
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
<modules>
|
||||
<module>blog-feed</module>
|
||||
<module>buildingblocks</module>
|
||||
<module>buildingblocks-client</module>
|
||||
<module>calendar</module>
|
||||
<module>car</module>
|
||||
<module>common</module>
|
||||
<module>creditcard-payment-jaxb</module>
|
||||
<module>creditcard-payment-jaxb-policy</module>
|
||||
<module>creditcard-payment-sdo</module>
|
||||
<module>creditcard-payment-webapp</module>
|
||||
<module>currency</module>
|
||||
<module>currency-corba</module>
|
||||
<module>currency-jms</module>
|
||||
<module>currency-jsp</module>
|
||||
<module>currency-rmi</module>
|
||||
<module>currency-servlet</module>
|
||||
<module>currency-ws</module>
|
||||
<module>databinding-client</module>
|
||||
<module>emailgateway</module>
|
||||
<module>feed-logger</module>
|
||||
<module>flight</module>
|
||||
<module>fullapp-ui</module>
|
||||
<module>fullapp-coordination</module>
|
||||
<module>fullapp-currency</module>
|
||||
<module>fullapp-packagedtrip</module>
|
||||
<module>fullapp-bespoketrip</module>
|
||||
<module>fullapp-shoppingcart</module>
|
||||
<module>help-pages</module>
|
||||
<module>hotel</module>
|
||||
<module>interaction-client</module>
|
||||
<module>interaction-service-remote</module>
|
||||
<module>introducing-client</module>
|
||||
<module>introducing-tours</module>
|
||||
<module>introducing-trips</module>
|
||||
<module>notification</module>
|
||||
<module>notification-ws</module>
|
||||
<module>notification-corba</module>
|
||||
<module>notification-ejb</module>
|
||||
<module>notification-jms</module>
|
||||
<module>notification-rmi</module>
|
||||
<module>shoppingcart</module>
|
||||
<module>travelcatalog</module>
|
||||
<module>tripbooking</module>
|
||||
<module>trip</module>
|
||||
<module>scatours</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-policy</module>
|
||||
<module>payment-spring-scatag</module>
|
||||
<module>payment-bpel-process</module>
|
||||
<module>payment-bpel</module>
|
||||
<module>payment-groovy</module>
|
||||
<module>payment-python</module>
|
||||
<module>policy-client</module>
|
||||
<module>trip-policy</module>
|
||||
<module>usingsca</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -29,18 +29,9 @@
|
|||
<packaging>pom</packaging>
|
||||
<name>Apache Tuscany SCA Tours Domain Configurations</name>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>fullapp</module>
|
||||
<module>introducing</module>
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
<modules>
|
||||
<module>fullapp</module>
|
||||
<module>introducing</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -29,21 +29,12 @@
|
|||
<packaging>pom</packaging>
|
||||
<name>Apache Tuscany SCA Tours non-SCA Services</name>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>smsgateway-jaxws</module>
|
||||
<module>smsgateway-corba</module>
|
||||
<module>smsgateway-ejb</module>
|
||||
<module>smsgateway-jms</module>
|
||||
<module>smsgateway-rmi</module>
|
||||
</modules>
|
||||
</profile>
|
||||
|
||||
</profiles>
|
||||
<modules>
|
||||
<module>smsgateway-jaxws</module>
|
||||
<module>smsgateway-corba</module>
|
||||
<module>smsgateway-ejb</module>
|
||||
<module>smsgateway-jms</module>
|
||||
<module>smsgateway-rmi</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
|
|
@ -29,18 +29,10 @@
|
|||
<packaging>pom</packaging>
|
||||
<name>Apache Tuscany SCA Tours Utilities</name>
|
||||
|
||||
<profiles>
|
||||
<profile>
|
||||
<id>default</id>
|
||||
<activation>
|
||||
<activeByDefault>true</activeByDefault>
|
||||
</activation>
|
||||
<modules>
|
||||
<module>jaxws-runtime</module>
|
||||
<module>launcher-common</module>
|
||||
<module>openejb-runtime</module>
|
||||
</modules>
|
||||
</profile>
|
||||
</profiles>
|
||||
<modules>
|
||||
<module>jaxws-runtime</module>
|
||||
<module>launcher-common</module>
|
||||
<module>openejb-runtime</module>
|
||||
</modules>
|
||||
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue