diff options
author | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-28 01:10:32 +0000 |
---|---|---|
committer | jsdelfino <jsdelfino@13f79535-47bb-0310-9956-ffa450edef68> | 2008-08-28 01:10:32 +0000 |
commit | 9b7ade113deb34569586321cca5376c25a6161d1 (patch) | |
tree | ec67f9c45eddd63175733ce1d024bd7b47376bcd /java/sca/distribution/features/web20 | |
parent | dc22cd629d7d85d56d1ed92690d0e0b9077c2e40 (diff) |
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
Diffstat (limited to 'java/sca/distribution/features/web20')
-rw-r--r-- | java/sca/distribution/features/web20/pom.xml | 63 | ||||
-rw-r--r-- | java/sca/distribution/features/web20/src/main/components/src-modules.xml | 2 |
2 files changed, 37 insertions, 28 deletions
diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml index 5da456d5a9..ecd556c666 100644 --- a/java/sca/distribution/features/web20/pom.xml +++ b/java/sca/distribution/features/web20/pom.xml @@ -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> diff --git a/java/sca/distribution/features/web20/src/main/components/src-modules.xml b/java/sca/distribution/features/web20/src/main/components/src-modules.xml index 447675e248..15b3f2a522 100644 --- a/java/sca/distribution/features/web20/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/web20/src/main/components/src-modules.xml @@ -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> |