Minor improvements of some of the build scripts. Do not need to build the assembly with the -Pmodules profile. Excluded the distro modules from the -Pmodules profile. Fixed up some of the OSGi dependencies.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@689690 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
jsdelfino 2008-08-28 01:10:32 +00:00
parent dc22cd629d
commit 9b7ade113d
14 changed files with 258 additions and 212 deletions

View file

@ -72,6 +72,39 @@
</dependencies>
<profiles>
<!-- Default build profile that can be used to build the distro packages -->
<profile>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Profile that can be used to build the modules included in the distro -->
<profile>
@ -118,15 +151,10 @@
<module>../../../modules/databinding-sdo</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/distribution-core</module>
<module>../../../modules/distribution-ejava</module>
<module>../../../modules/distribution-manager</module>
<module>../../../modules/distribution-process</module>
<module>../../../modules/distribution-web20</module>
<module>../../../modules/distribution-webservice</module>
<module>../../../modules/domain-manager</module>
<module>../../../modules/endpoint</module>
<module>../../../modules/extensibility</module>
<module>../../../modules/extensibility-osgi</module>
<module>../../../modules/extension-helper</module>
<module>../../../modules/host-ejb</module>
<module>../../../modules/host-embedded</module>
@ -158,6 +186,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
<module>../../../modules/node-launcher-osgi</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/node-manager</module>
<module>../../../modules/policy</module>
@ -175,31 +204,4 @@
</profile>
</profiles>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-all-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View file

@ -74,6 +74,7 @@
<include>domain-manager/**/*</include>
<include>endpoint/**/*</include>
<include>extensibility/**/*</include>
<include>extensibility-osgi/**/*</include>
<include>extension-helper/**/*</include>
<include>host-ejb/**/*</include>
<include>host-embedded/**/*</include>
@ -105,6 +106,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
<include>node-launcher-osgi/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>node-manager/**/*</include>
<include>policy/**/*</include>

View file

@ -231,6 +231,39 @@
<profiles>
<!-- Default build profile that can be used to build the distro packages -->
<profile>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Profile that can be used to build the modules included in the distro -->
<profile>
<id>modules</id>
@ -286,31 +319,4 @@
</profile>
</profiles>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View file

@ -74,6 +74,39 @@
<profiles>
<!-- Default build profile that can be used to build the distro packages -->
<profile>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Profile that can be used to build the modules included in the distro -->
<profile>
<id>modules</id>
@ -101,9 +134,9 @@
<module>../../../modules/databinding-jaxb</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/distribution-core</module>
<module>../../../modules/endpoint</module>
<module>../../../modules/extensibility</module>
<module>../../../modules/extensibility-osgi</module>
<module>../../../modules/extension-helper</module>
<module>../../../modules/host-ejb</module>
<module>../../../modules/host-embedded</module>
@ -127,6 +160,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
<module>../../../modules/node-launcher-osgi</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
@ -138,31 +172,4 @@
</profile>
</profiles>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-ejava-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View file

@ -50,6 +50,7 @@
<include>distribution-core/**/*</include>
<include>endpoint/**/*</include>
<include>extensibility/**/*</include>
<include>extensibility-osgi/**/*</include>
<include>extension-helper/**/*</include>
<include>host-ejb/**/*</include>
<include>host-embedded/**/*</include>
@ -73,6 +74,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
<include>node-launcher-osgi/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>

View file

@ -18,18 +18,9 @@
# This script can be used to generate a Maven build profile that includes all
# the modules included directly or transitively in a distribution
cat pom.xml | awk 'BEGIN { i=0 } /<profiles>/ { i=1; print } /.*/ { if (i==0) print } '
cat pom.xml | awk 'BEGIN { i=0 } /<modules>/ { i=1; print } /.*/ { if (i==0) print } '
echo ""
echo " <!-- Profile that can be used to build the modules included in the distro -->"
echo " <profile>"
echo " <id>modules</id>"
echo " <modules>"
mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | grep -v "distribution-" | sort | awk '{ printf " <module>../../../modules/%s</module>\n", $1 }'
mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf " <module>../../../modules/%s</module>\n", $1 }'
echo " </modules>"
echo " </profile>"
cat pom.xml | awk 'BEGIN { i=0 } /<\/profiles>/ { i=1 } /.*/ { if (i==1) print } '
cat pom.xml | awk 'BEGIN { i=0 } /<\/modules>/ { i=1 } /.*/ { if (i==1) print } '

View file

@ -141,6 +141,39 @@
<profiles>
<!-- Default build profile that can be used to build the distro packages -->
<profile>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Profile that can be used to build the modules included in the distro -->
<profile>
<id>modules</id>
@ -173,10 +206,10 @@
<module>../../../modules/databinding-jaxb</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/distribution-core</module>
<module>../../../modules/domain-manager</module>
<module>../../../modules/endpoint</module>
<module>../../../modules/extensibility</module>
<module>../../../modules/extensibility-osgi</module>
<module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/host-jetty</module>
@ -201,6 +234,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
<module>../../../modules/node-launcher-osgi</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/node-manager</module>
<module>../../../modules/policy</module>
@ -217,31 +251,4 @@
</profile>
</profiles>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-manager-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View file

@ -56,6 +56,7 @@
<include>domain-manager/**/*</include>
<include>endpoint/**/*</include>
<include>extensibility/**/*</include>
<include>extensibility-osgi/**/*</include>
<include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>host-jetty/**/*</include>
@ -80,6 +81,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
<include>node-launcher-osgi/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>node-manager/**/*</include>
<include>policy/**/*</include>

View file

@ -55,6 +55,39 @@
<profiles>
<!-- Default build profile that can be used to build the distro packages -->
<profile>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Profile that can be used to build the modules included in the distro -->
<profile>
<id>modules</id>
@ -79,9 +112,9 @@
<module>../../../modules/databinding-sdo</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/distribution-core</module>
<module>../../../modules/endpoint</module>
<module>../../../modules/extensibility</module>
<module>../../../modules/extensibility-osgi</module>
<module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/implementation-bpel</module>
@ -103,6 +136,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
<module>../../../modules/node-launcher-osgi</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
@ -114,31 +148,4 @@
</profile>
</profiles>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-process-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View file

@ -47,6 +47,7 @@
<include>distribution-core/**/*</include>
<include>endpoint/**/*</include>
<include>extensibility/**/*</include>
<include>extensibility-osgi/**/*</include>
<include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>implementation-bpel/**/*</include>
@ -68,6 +69,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
<include>node-launcher-osgi/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>

View file

@ -98,6 +98,39 @@
<profiles>
<!-- Default build profile that can be used to build the distro packages -->
<profile>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Profile that can be used to build the modules included in the distro -->
<profile>
<id>modules</id>
@ -130,9 +163,9 @@
<module>../../../modules/databinding-json</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/distribution-core</module>
<module>../../../modules/endpoint</module>
<module>../../../modules/extensibility</module>
<module>../../../modules/extensibility-osgi</module>
<module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/host-jetty</module>
@ -156,6 +189,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
<module>../../../modules/node-launcher-osgi</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
@ -167,31 +201,4 @@
</profile>
</profiles>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-web20-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View file

@ -55,6 +55,7 @@
<include>distribution-core/**/*</include>
<include>endpoint/**/*</include>
<include>extensibility/**/*</include>
<include>extensibility-osgi/**/*</include>
<include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>host-jetty/**/*</include>
@ -78,6 +79,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
<include>node-launcher-osgi/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>

View file

@ -112,6 +112,39 @@
<profiles>
<!-- Default build profile that can be used to build the distro packages -->
<profile>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<!-- Profile that can be used to build the modules included in the distro -->
<profile>
<id>modules</id>
@ -141,9 +174,9 @@
<module>../../../modules/databinding-jaxb-axiom</module>
<module>../../../modules/definitions</module>
<module>../../../modules/definitions-xml</module>
<module>../../../modules/distribution-core</module>
<module>../../../modules/endpoint</module>
<module>../../../modules/extensibility</module>
<module>../../../modules/extensibility-osgi</module>
<module>../../../modules/host-embedded</module>
<module>../../../modules/host-http</module>
<module>../../../modules/host-jetty</module>
@ -163,6 +196,7 @@
<module>../../../modules/node-api</module>
<module>../../../modules/node-impl</module>
<module>../../../modules/node-launcher</module>
<module>../../../modules/node-launcher-osgi</module>
<module>../../../modules/node-launcher-webapp</module>
<module>../../../modules/policy</module>
<module>../../../modules/policy-security</module>
@ -176,31 +210,4 @@
</profile>
</profiles>
<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>
<descriptor>src/main/assembly/src.xml</descriptor>
</descriptors>
<tarLongFileMode>gnu</tarLongFileMode>
<finalName>apache-tuscany-sca-webservice-1.4-SNAPSHOT</finalName>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>

View file

@ -52,6 +52,7 @@
<include>distribution-core/**/*</include>
<include>endpoint/**/*</include>
<include>extensibility/**/*</include>
<include>extensibility-osgi/**/*</include>
<include>host-embedded/**/*</include>
<include>host-http/**/*</include>
<include>host-jetty/**/*</include>
@ -71,6 +72,7 @@
<include>node-api/**/*</include>
<include>node-impl/**/*</include>
<include>node-launcher/**/*</include>
<include>node-launcher-osgi/**/*</include>
<include>node-launcher-webapp/**/*</include>
<include>policy/**/*</include>
<include>policy-security/**/*</include>