diff options
14 files changed, 258 insertions, 212 deletions
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml index 554d8ab101..b53a091d7f 100644 --- a/java/sca/distribution/features/all/pom.xml +++ b/java/sca/distribution/features/all/pom.xml @@ -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> diff --git a/java/sca/distribution/features/all/src/main/components/src-modules.xml b/java/sca/distribution/features/all/src/main/components/src-modules.xml index d3975c5992..17cf7b4384 100644 --- a/java/sca/distribution/features/all/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/all/src/main/components/src-modules.xml @@ -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> diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml index c13a12e40b..24cf8437cb 100644 --- a/java/sca/distribution/features/core/pom.xml +++ b/java/sca/distribution/features/core/pom.xml @@ -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> diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml index 302041bda9..34a3faf9f4 100644 --- a/java/sca/distribution/features/ejava/pom.xml +++ b/java/sca/distribution/features/ejava/pom.xml @@ -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> diff --git a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml b/java/sca/distribution/features/ejava/src/main/components/src-modules.xml index d99001960c..7932a54b08 100644 --- a/java/sca/distribution/features/ejava/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/ejava/src/main/components/src-modules.xml @@ -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> diff --git a/java/sca/distribution/features/etc/generate-pom.sh b/java/sca/distribution/features/etc/generate-pom.sh index 2a198eb3f2..538623afa7 100755 --- a/java/sca/distribution/features/etc/generate-pom.sh +++ b/java/sca/distribution/features/etc/generate-pom.sh @@ -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 } ' diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml index 045f529094..1350976317 100644 --- a/java/sca/distribution/features/manager/pom.xml +++ b/java/sca/distribution/features/manager/pom.xml @@ -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> diff --git a/java/sca/distribution/features/manager/src/main/components/src-modules.xml b/java/sca/distribution/features/manager/src/main/components/src-modules.xml index c4983de155..7886bc9b68 100644 --- a/java/sca/distribution/features/manager/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/manager/src/main/components/src-modules.xml @@ -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> diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml index 59c6f98e9a..c6291771e5 100644 --- a/java/sca/distribution/features/process/pom.xml +++ b/java/sca/distribution/features/process/pom.xml @@ -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> diff --git a/java/sca/distribution/features/process/src/main/components/src-modules.xml b/java/sca/distribution/features/process/src/main/components/src-modules.xml index 834606511c..9681a9bda9 100644 --- a/java/sca/distribution/features/process/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/process/src/main/components/src-modules.xml @@ -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> 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> diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml index 4ca873f418..809dba0f0d 100644 --- a/java/sca/distribution/features/webservice/pom.xml +++ b/java/sca/distribution/features/webservice/pom.xml @@ -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> diff --git a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml b/java/sca/distribution/features/webservice/src/main/components/src-modules.xml index dec46fde52..d2ae2a0da9 100644 --- a/java/sca/distribution/features/webservice/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/webservice/src/main/components/src-modules.xml @@ -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> |