Author: nash
Date: Wed Apr 14 16:07:09 2010
New Revision: 933999
URL: http://svn.apache.org/viewvc?rev=933999&view=rev
Log:
Add binaries module (TUSCANY-3528)
Added:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/ (with props)
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/
- copied from r929121,
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/bundle/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/jaxws/
- copied from r929121,
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/jaxws/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/ode/
- copied from r929121,
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/ode/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/openejb/
- copied from r929121,
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/openejb/
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/pom.xml
- copied, changed from r933986,
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/
- copied from r929121,
tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/src/
Removed:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/src.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/components/bin-common.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/release/
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/jaxws/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/ode/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/openejb/pom.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-jaxws.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-ode.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-openejb.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-selfcontained.xml
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin.xml
Propchange: tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Apr 14 16:07:09 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
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/bundle/pom.xml
Wed Apr 14 16:07:09 2010
@@ -27,8 +27,8 @@
</parent>
<version>1.0-SNAPSHOT</version>
- <artifactId>scatours-distribution-bundle</artifactId>
- <name>Apache Tuscany SCA Tours Distribution Bundle</name>
+ <artifactId>scatours-binaries-bundle</artifactId>
+ <name>Apache Tuscany SCA Tours Binaries Bundle</name>
<packaging>pom</packaging>
<dependencies>
@@ -584,8 +584,7 @@
<phase>install</phase>
<configuration>
<tasks>
- <delete
dir="../target/apache-tuscany-scatours-${version}/tuscany-scatours-${version}/domainconfig/META-INF"
- includeemptydirs="true"/>
+ <delete dir="../target/domainconfig/META-INF"
includeemptydirs="true"/>
</tasks>
</configuration>
<goals>
@@ -597,10 +596,9 @@
</plugins>
</build>
-
<profiles>
<profile>
- <!-- The default profile produces a subset distribution which
excludes
+ <!-- The default profile produces a subset binaries package which
excludes
libraries that are present in the Tuscany SCA binary distro. -->
<id>default</id>
<activation>
@@ -619,15 +617,13 @@
<goal>single</goal>
</goals>
<configuration>
-
<outputDirectory>../target</outputDirectory>
<descriptors>
<descriptor>../src/main/assembly/bin.xml</descriptor>
-
<descriptor>../src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<archiveBaseDirectory>..</archiveBaseDirectory>
<outputDirectory>../target</outputDirectory>
-
<finalName>apache-tuscany-scatours-${version}</finalName>
+ <finalName>.</finalName>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
</configuration>
@@ -639,7 +635,7 @@
</profile>
<profile>
- <!-- Use mvn -Pselfcontained to produce a self-contained
distribution
+ <!-- Use mvn -Pselfcontained to produce a self-contained binaries
package
with all library dependencies included. -->
<id>selfcontained</id>
<build>
@@ -655,15 +651,13 @@
<goal>single</goal>
</goals>
<configuration>
-
<outputDirectory>../target</outputDirectory>
<descriptors>
<descriptor>../src/main/assembly/bin-selfcontained.xml</descriptor>
-
<descriptor>../src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<archiveBaseDirectory>..</archiveBaseDirectory>
<outputDirectory>../target</outputDirectory>
-
<finalName>apache-tuscany-scatours-${version}</finalName>
+ <finalName>.</finalName>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
</configuration>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/jaxws/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/jaxws/pom.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/jaxws/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/jaxws/pom.xml
Wed Apr 14 16:07:09 2010
@@ -28,8 +28,8 @@
<version>1.0-SNAPSHOT</version>
<!-- This module brings in the JAX-WS runtime dependencies that are needed
when running on JDK 5. -->
- <artifactId>scatours-distribution-jaxws</artifactId>
- <name>Apache Tuscany SCA Tours Distribution JAX-WS Dependencies for JDK
5</name>
+ <artifactId>scatours-binaries-jaxws</artifactId>
+ <name>Apache Tuscany SCA Tours Binaries JAX-WS Dependencies for JDK
5</name>
<packaging>pom</packaging>
<dependencies>
@@ -53,14 +53,13 @@
<goal>single</goal>
</goals>
<configuration>
- <outputDirectory>../target</outputDirectory>
<descriptors>
<descriptor>../src/main/assembly/bin-jaxws.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<archiveBaseDirectory>..</archiveBaseDirectory>
<outputDirectory>../target</outputDirectory>
-
<finalName>apache-tuscany-scatours-${version}</finalName>
+ <finalName>.</finalName>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
</configuration>
Modified: tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/ode/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/ode/pom.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/ode/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/ode/pom.xml Wed
Apr 14 16:07:09 2010
@@ -28,8 +28,8 @@
<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>
+ <artifactId>scatours-binaries-ode</artifactId>
+ <name>Apache Tuscany SCA Tours Binaries ODE Database</name>
<packaging>pom</packaging>
<dependencies>
@@ -54,14 +54,13 @@
<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>
+ <finalName>.</finalName>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
</configuration>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/openejb/pom.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/openejb/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/openejb/pom.xml
Wed Apr 14 16:07:09 2010
@@ -27,8 +27,8 @@
</parent>
<version>1.0-SNAPSHOT</version>
- <artifactId>scatours-distribution-openejb</artifactId>
- <name>Apache Tuscany SCA Tours Distribution OpenEJB Dependencies</name>
+ <artifactId>scatours-binaries-openejb</artifactId>
+ <name>Apache Tuscany SCA Tours Binaries OpenEJB Dependencies</name>
<packaging>pom</packaging>
<dependencies>
@@ -52,14 +52,13 @@
<goal>single</goal>
</goals>
<configuration>
- <outputDirectory>../target</outputDirectory>
<descriptors>
<descriptor>../src/main/assembly/bin-openejb.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<archiveBaseDirectory>..</archiveBaseDirectory>
<outputDirectory>../target</outputDirectory>
-
<finalName>apache-tuscany-scatours-${version}</finalName>
+ <finalName>.</finalName>
<appendAssemblyId>true</appendAssemblyId>
<ignoreDirFormatExtensions>true</ignoreDirFormatExtensions>
</configuration>
Copied: tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/pom.xml
(from r933986,
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/binaries/pom.xml?p2=tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/pom.xml&p1=tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml&r1=933986&r2=933999&rev=933999&view=diff
==============================================================================
--- tuscany/sca-java-1.x/trunk/tutorials/travelsample/distribution/pom.xml
(original)
+++ tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/pom.xml Wed Apr
14 16:07:09 2010
@@ -27,36 +27,14 @@
</parent>
<version>1.0-SNAPSHOT</version>
- <artifactId>scatours-distribution</artifactId>
- <name>Apache Tuscany SCA Tours Distribution</name>
+ <artifactId>scatours-binaries</artifactId>
+ <name>Apache Tuscany SCA Tours Binaries</name>
<packaging>pom</packaging>
- <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/src.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>
+ <modules>
+ <module>bundle</module>
+ <module>jaxws</module>
+ <module>ode</module>
+ <module>openejb</module>
+ </modules>
</project>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-jaxws.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-jaxws.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-jaxws.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-jaxws.xml
Wed Apr 14 16:07:09 2010
@@ -20,8 +20,7 @@
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly
-->
<id></id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-scatours-${version}</baseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<!--
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-ode.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-ode.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-ode.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-ode.xml
Wed Apr 14 16:07:09 2010
@@ -20,8 +20,7 @@
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly
-->
<id></id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-scatours-${version}</baseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<!--
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-openejb.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-openejb.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-openejb.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-openejb.xml
Wed Apr 14 16:07:09 2010
@@ -20,8 +20,7 @@
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly
-->
<id></id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-scatours-${version}</baseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<!--
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-selfcontained.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-selfcontained.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-selfcontained.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin-selfcontained.xml
Wed Apr 14 16:07:09 2010
@@ -20,8 +20,7 @@
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly
-->
<id></id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-scatours-${version}</baseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<!--
@@ -31,7 +30,6 @@
</formats>
<componentDescriptors>
-
<componentDescriptor>../src/main/components/bin-common.xml</componentDescriptor>
<componentDescriptor>../src/main/components/bin-modules.xml</componentDescriptor>
<componentDescriptor>../src/main/components/bin-selfcontained.xml</componentDescriptor>
</componentDescriptors>
Modified:
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin.xml
URL:
http://svn.apache.org/viewvc/tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin.xml?rev=933999&r1=929121&r2=933999&view=diff
==============================================================================
---
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin.xml
(original)
+++
tuscany/sca-java-1.x/trunk/tutorials/travelsample/binaries/src/main/assembly/bin.xml
Wed Apr 14 16:07:09 2010
@@ -20,8 +20,7 @@
<assembly>
<!-- id typically identifies the "type" (src vs bin etc) of the assembly
-->
<id></id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <baseDirectory>tuscany-scatours-${version}</baseDirectory>
+ <includeBaseDirectory>false</includeBaseDirectory>
<formats>
<format>dir</format>
<!--
@@ -31,7 +30,6 @@
</formats>
<componentDescriptors>
-
<componentDescriptor>../src/main/components/bin-common.xml</componentDescriptor>
<componentDescriptor>../src/main/components/bin-modules.xml</componentDescriptor>
<componentDescriptor>../src/main/components/bin-default.xml</componentDescriptor>
</componentDescriptors>
