diff options
Diffstat (limited to 'java/sca')
16 files changed, 995 insertions, 196 deletions
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml index 07a1b37731..3cf00ca572 100644 --- a/java/sca/distribution/features/all/pom.xml +++ b/java/sca/distribution/features/all/pom.xml @@ -72,10 +72,104 @@ </dependencies> <profiles> - <!-- Profile to use to build distributions --> + <!-- Profile that can be used to build the modules included in the distro --> <profile> - <id>distribution</id> + <id>dependencies</id> <modules> + <module>../../../modules/assembly</module> + <module>../../../modules/assembly-xml</module> + <module>../../../modules/assembly-xsd</module> + <module>../../../modules/binding-atom</module> + <module>../../../modules/binding-atom-abdera</module> + <module>../../../modules/binding-ejb</module> + <module>../../../modules/binding-ejb-runtime</module> + <module>../../../modules/binding-http</module> + <module>../../../modules/binding-http-runtime</module> + <module>../../../modules/binding-jms</module> + <module>../../../modules/binding-jms-runtime</module> + <module>../../../modules/binding-jsonrpc</module> + <module>../../../modules/binding-jsonrpc-runtime</module> + <module>../../../modules/binding-rss</module> + <module>../../../modules/binding-rss-rome</module> + <module>../../../modules/binding-sca</module> + <module>../../../modules/binding-sca-axis2</module> + <module>../../../modules/binding-sca-xml</module> + <module>../../../modules/binding-ws</module> + <module>../../../modules/binding-ws-axis2</module> + <module>../../../modules/binding-ws-wsdlgen</module> + <module>../../../modules/binding-ws-xml</module> + <module>../../../modules/contribution</module> + <module>../../../modules/contribution-impl</module> + <module>../../../modules/contribution-java</module> + <module>../../../modules/contribution-namespace</module> + <module>../../../modules/contribution-resource</module> + <module>../../../modules/contribution-xml</module> + <module>../../../modules/core</module> + <module>../../../modules/core-databinding</module> + <module>../../../modules/core-spi</module> + <module>../../../modules/data-api</module> + <module>../../../modules/databinding</module> + <module>../../../modules/databinding-axiom</module> + <module>../../../modules/databinding-jaxb</module> + <module>../../../modules/databinding-jaxb-axiom</module> + <module>../../../modules/databinding-json</module> + <module>../../../modules/databinding-saxon</module> + <module>../../../modules/databinding-sdo</module> + <module>../../../modules/definitions</module> + <module>../../../modules/definitions-xml</module> + <module>../../../modules/distribution-all</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/extension-helper</module> + <module>../../../modules/host-ejb</module> + <module>../../../modules/host-embedded</module> + <module>../../../modules/host-http</module> + <module>../../../modules/host-jetty</module> + <module>../../../modules/implementation-bpel</module> + <module>../../../modules/implementation-bpel-ode</module> + <module>../../../modules/implementation-ejb</module> + <module>../../../modules/implementation-java</module> + <module>../../../modules/implementation-java-runtime</module> + <module>../../../modules/implementation-java-xml</module> + <module>../../../modules/implementation-node</module> + <module>../../../modules/implementation-node-runtime</module> + <module>../../../modules/implementation-resource</module> + <module>../../../modules/implementation-resource-runtime</module> + <module>../../../modules/implementation-script</module> + <module>../../../modules/implementation-spring</module> + <module>../../../modules/implementation-widget</module> + <module>../../../modules/implementation-widget-runtime</module> + <module>../../../modules/implementation-xquery</module> + <module>../../../modules/interface</module> + <module>../../../modules/interface-java</module> + <module>../../../modules/interface-java-jaxws</module> + <module>../../../modules/interface-java-xml</module> + <module>../../../modules/interface-wsdl</module> + <module>../../../modules/interface-wsdl-xml</module> + <module>../../../modules/monitor</module> + <module>../../../modules/monitor-logging</module> + <module>../../../modules/node2-api</module> + <module>../../../modules/node2-impl</module> + <module>../../../modules/node2-launcher</module> + <module>../../../modules/node-manager</module> + <module>../../../modules/policy</module> + <module>../../../modules/policy-security</module> + <module>../../../modules/policy-security-ws</module> + <module>../../../modules/policy-xml</module> + <module>../../../modules/policy-xml-ws</module> + <module>../../../modules/sca-api</module> + <module>../../../modules/workspace</module> + <module>../../../modules/workspace-impl</module> + <module>../../../modules/workspace-xml</module> + <module>../../../modules/xsd</module> + <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/java/sca/distribution/features/all/src/main/assembly/src.xml b/java/sca/distribution/features/all/src/main/assembly/src.xml index 92734897e7..8ffe74337a 100644 --- a/java/sca/distribution/features/all/src/main/assembly/src.xml +++ b/java/sca/distribution/features/all/src/main/assembly/src.xml @@ -30,27 +30,6 @@ <format>zip</format> </formats> - <moduleSets> - <moduleSet> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Specific files/folders to exclude --> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </sources> - </moduleSet> - </moduleSets> - <fileSets> <fileSet> <directory>src/main/release</directory> @@ -71,6 +50,119 @@ <include>NOTICE</include> </includes> </fileSet> + + <!-- Add module sources to the modules directory --> + <fileSet> + <directory>../../../modules</directory> + <outputDirectory>modules</outputDirectory> + <includes> + <include>assembly/**/*</include> + <include>assembly-xml/**/*</include> + <include>assembly-xsd/**/*</include> + <include>binding-atom/**/*</include> + <include>binding-atom-abdera/**/*</include> + <include>binding-ejb/**/*</include> + <include>binding-ejb-runtime/**/*</include> + <include>binding-http/**/*</include> + <include>binding-http-runtime/**/*</include> + <include>binding-jms/**/*</include> + <include>binding-jms-runtime/**/*</include> + <include>binding-jsonrpc/**/*</include> + <include>binding-jsonrpc-runtime/**/*</include> + <include>binding-rss/**/*</include> + <include>binding-rss-rome/**/*</include> + <include>binding-sca/**/*</include> + <include>binding-sca-axis2/**/*</include> + <include>binding-sca-xml/**/*</include> + <include>binding-ws/**/*</include> + <include>binding-ws-axis2/**/*</include> + <include>binding-ws-wsdlgen/**/*</include> + <include>binding-ws-xml/**/*</include> + <include>contribution/**/*</include> + <include>contribution-impl/**/*</include> + <include>contribution-java/**/*</include> + <include>contribution-namespace/**/*</include> + <include>contribution-resource/**/*</include> + <include>contribution-xml/**/*</include> + <include>core/**/*</include> + <include>core-databinding/**/*</include> + <include>core-spi/**/*</include> + <include>data-api/**/*</include> + <include>databinding/**/*</include> + <include>databinding-axiom/**/*</include> + <include>databinding-jaxb/**/*</include> + <include>databinding-jaxb-axiom/**/*</include> + <include>databinding-json/**/*</include> + <include>databinding-saxon/**/*</include> + <include>databinding-sdo/**/*</include> + <include>definitions/**/*</include> + <include>definitions-xml/**/*</include> + <include>distribution-all/**/*</include> + <include>distribution-core/**/*</include> + <include>distribution-ejava/**/*</include> + <include>distribution-manager/**/*</include> + <include>distribution-process/**/*</include> + <include>distribution-web20/**/*</include> + <include>distribution-webservice/**/*</include> + <include>domain-manager/**/*</include> + <include>endpoint/**/*</include> + <include>extensibility/**/*</include> + <include>extension-helper/**/*</include> + <include>host-ejb/**/*</include> + <include>host-embedded/**/*</include> + <include>host-http/**/*</include> + <include>host-jetty/**/*</include> + <include>implementation-bpel/**/*</include> + <include>implementation-bpel-ode/**/*</include> + <include>implementation-ejb/**/*</include> + <include>implementation-java/**/*</include> + <include>implementation-java-runtime/**/*</include> + <include>implementation-java-xml/**/*</include> + <include>implementation-node/**/*</include> + <include>implementation-node-runtime/**/*</include> + <include>implementation-resource/**/*</include> + <include>implementation-resource-runtime/**/*</include> + <include>implementation-script/**/*</include> + <include>implementation-spring/**/*</include> + <include>implementation-widget/**/*</include> + <include>implementation-widget-runtime/**/*</include> + <include>implementation-xquery/**/*</include> + <include>interface/**/*</include> + <include>interface-java/**/*</include> + <include>interface-java-jaxws/**/*</include> + <include>interface-java-xml/**/*</include> + <include>interface-wsdl/**/*</include> + <include>interface-wsdl-xml/**/*</include> + <include>monitor/**/*</include> + <include>monitor-logging/**/*</include> + <include>node2-api/**/*</include> + <include>node2-impl/**/*</include> + <include>node2-launcher/**/*</include> + <include>node-manager/**/*</include> + <include>policy/**/*</include> + <include>policy-security/**/*</include> + <include>policy-security-ws/**/*</include> + <include>policy-xml/**/*</include> + <include>policy-xml-ws/**/*</include> + <include>sca-api/**/*</include> + <include>workspace/**/*</include> + <include>workspace-impl/**/*</include> + <include>workspace-xml/**/*</include> + <include>xsd/**/*</include> + <include>xsd-xml/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>pom.xml</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </fileSet> </fileSets> </assembly> diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml index 9e42f75717..1c5e627938 100644 --- a/java/sca/distribution/features/core/pom.xml +++ b/java/sca/distribution/features/core/pom.xml @@ -202,9 +202,9 @@ </dependencies> <profiles> - <!-- Profile to use to build distributions --> + <!-- Profile that can be used to build the modules included in the distro --> <profile> - <id>distribution</id> + <id>dependencies</id> <modules> <module>../../../modules/assembly</module> <module>../../../modules/assembly-xml</module> diff --git a/java/sca/distribution/features/core/src/main/assembly/src.xml b/java/sca/distribution/features/core/src/main/assembly/src.xml index 92734897e7..fa176334de 100644 --- a/java/sca/distribution/features/core/src/main/assembly/src.xml +++ b/java/sca/distribution/features/core/src/main/assembly/src.xml @@ -30,27 +30,6 @@ <format>zip</format> </formats> - <moduleSets> - <moduleSet> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Specific files/folders to exclude --> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </sources> - </moduleSet> - </moduleSets> - <fileSets> <fileSet> <directory>src/main/release</directory> @@ -71,6 +50,68 @@ <include>NOTICE</include> </includes> </fileSet> + + <!-- Add module sources to the modules directory --> + <fileSet> + <directory>../../../modules</directory> + <outputDirectory>modules</outputDirectory> + <includes> + <include>assembly/**/*</include> + <include>assembly-xml/**/*</include> + <include>assembly-xsd/**/*</include> + <include>binding-sca/**/*</include> + <include>binding-sca-xml/**/*</include> + <include>contribution/**/*</include> + <include>contribution-impl/**/*</include> + <include>contribution-java/**/*</include> + <include>contribution-namespace/**/*</include> + <include>contribution-xml/**/*</include> + <include>core/**/*</include> + <include>core-databinding/**/*</include> + <include>core-spi/**/*</include> + <include>data-api/**/*</include> + <include>databinding/**/*</include> + <include>databinding-jaxb/**/*</include> + <include>definitions/**/*</include> + <include>definitions-xml/**/*</include> + <include>endpoint/**/*</include> + <include>extensibility/**/*</include> + <include>host-embedded/**/*</include> + <include>host-http/**/*</include> + <include>implementation-java/**/*</include> + <include>implementation-java-runtime/**/*</include> + <include>implementation-java-xml/**/*</include> + <include>implementation-node/**/*</include> + <include>implementation-node-runtime/**/*</include> + <include>interface/**/*</include> + <include>interface-java/**/*</include> + <include>interface-java-jaxws/**/*</include> + <include>interface-java-xml/**/*</include> + <include>interface-wsdl/**/*</include> + <include>interface-wsdl-xml/**/*</include> + <include>monitor/**/*</include> + <include>node2-api/**/*</include> + <include>node2-impl/**/*</include> + <include>node2-launcher/**/*</include> + <include>policy/**/*</include> + <include>policy-security/**/*</include> + <include>policy-xml/**/*</include> + <include>sca-api/**/*</include> + <include>xsd/**/*</include> + <include>xsd-xml/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>pom.xml</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </fileSet> </fileSets> </assembly> diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml index 436e39cb32..ac5ba49953 100644 --- a/java/sca/distribution/features/ejava/pom.xml +++ b/java/sca/distribution/features/ejava/pom.xml @@ -73,10 +73,65 @@ </dependencies> <profiles> - <!-- Profile to use to build distributions --> + <!-- Profile that can be used to build the modules included in the distro --> <profile> - <id>distribution</id> + <id>dependencies</id> <modules> + <module>../../../modules/assembly</module> + <module>../../../modules/assembly-xml</module> + <module>../../../modules/assembly-xsd</module> + <module>../../../modules/binding-ejb</module> + <module>../../../modules/binding-ejb-runtime</module> + <module>../../../modules/binding-jms</module> + <module>../../../modules/binding-jms-runtime</module> + <module>../../../modules/binding-sca</module> + <module>../../../modules/binding-sca-xml</module> + <module>../../../modules/contribution</module> + <module>../../../modules/contribution-impl</module> + <module>../../../modules/contribution-java</module> + <module>../../../modules/contribution-namespace</module> + <module>../../../modules/contribution-xml</module> + <module>../../../modules/core</module> + <module>../../../modules/core-databinding</module> + <module>../../../modules/core-spi</module> + <module>../../../modules/data-api</module> + <module>../../../modules/databinding</module> + <module>../../../modules/databinding-axiom</module> + <module>../../../modules/databinding-jaxb</module> + <module>../../../modules/definitions</module> + <module>../../../modules/definitions-xml</module> + <module>../../../modules/distribution-core</module> + <module>../../../modules/distribution-ejava</module> + <module>../../../modules/endpoint</module> + <module>../../../modules/extensibility</module> + <module>../../../modules/extension-helper</module> + <module>../../../modules/host-ejb</module> + <module>../../../modules/host-embedded</module> + <module>../../../modules/host-http</module> + <module>../../../modules/implementation-ejb</module> + <module>../../../modules/implementation-java</module> + <module>../../../modules/implementation-java-runtime</module> + <module>../../../modules/implementation-java-xml</module> + <module>../../../modules/implementation-node</module> + <module>../../../modules/implementation-node-runtime</module> + <module>../../../modules/implementation-script</module> + <module>../../../modules/implementation-spring</module> + <module>../../../modules/interface</module> + <module>../../../modules/interface-java</module> + <module>../../../modules/interface-java-jaxws</module> + <module>../../../modules/interface-java-xml</module> + <module>../../../modules/interface-wsdl</module> + <module>../../../modules/interface-wsdl-xml</module> + <module>../../../modules/monitor</module> + <module>../../../modules/node2-api</module> + <module>../../../modules/node2-impl</module> + <module>../../../modules/node2-launcher</module> + <module>../../../modules/policy</module> + <module>../../../modules/policy-security</module> + <module>../../../modules/policy-xml</module> + <module>../../../modules/sca-api</module> + <module>../../../modules/xsd</module> + <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/java/sca/distribution/features/ejava/src/main/assembly/src.xml b/java/sca/distribution/features/ejava/src/main/assembly/src.xml index 92734897e7..f09965c4b7 100644 --- a/java/sca/distribution/features/ejava/src/main/assembly/src.xml +++ b/java/sca/distribution/features/ejava/src/main/assembly/src.xml @@ -30,27 +30,6 @@ <format>zip</format> </formats> - <moduleSets> - <moduleSet> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Specific files/folders to exclude --> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </sources> - </moduleSet> - </moduleSets> - <fileSets> <fileSet> <directory>src/main/release</directory> @@ -71,6 +50,80 @@ <include>NOTICE</include> </includes> </fileSet> + + <!-- Add module sources to the modules directory --> + <fileSet> + <directory>../../../modules</directory> + <outputDirectory>modules</outputDirectory> + <includes> + <include>assembly/**/*</include> + <include>assembly-xml/**/*</include> + <include>assembly-xsd/**/*</include> + <include>binding-ejb/**/*</include> + <include>binding-ejb-runtime/**/*</include> + <include>binding-jms/**/*</include> + <include>binding-jms-runtime/**/*</include> + <include>binding-sca/**/*</include> + <include>binding-sca-xml/**/*</include> + <include>contribution/**/*</include> + <include>contribution-impl/**/*</include> + <include>contribution-java/**/*</include> + <include>contribution-namespace/**/*</include> + <include>contribution-xml/**/*</include> + <include>core/**/*</include> + <include>core-databinding/**/*</include> + <include>core-spi/**/*</include> + <include>data-api/**/*</include> + <include>databinding/**/*</include> + <include>databinding-axiom/**/*</include> + <include>databinding-jaxb/**/*</include> + <include>definitions/**/*</include> + <include>definitions-xml/**/*</include> + <include>distribution-core/**/*</include> + <include>distribution-ejava/**/*</include> + <include>endpoint/**/*</include> + <include>extensibility/**/*</include> + <include>extension-helper/**/*</include> + <include>host-ejb/**/*</include> + <include>host-embedded/**/*</include> + <include>host-http/**/*</include> + <include>implementation-ejb/**/*</include> + <include>implementation-java/**/*</include> + <include>implementation-java-runtime/**/*</include> + <include>implementation-java-xml/**/*</include> + <include>implementation-node/**/*</include> + <include>implementation-node-runtime/**/*</include> + <include>implementation-script/**/*</include> + <include>implementation-spring/**/*</include> + <include>interface/**/*</include> + <include>interface-java/**/*</include> + <include>interface-java-jaxws/**/*</include> + <include>interface-java-xml/**/*</include> + <include>interface-wsdl/**/*</include> + <include>interface-wsdl-xml/**/*</include> + <include>monitor/**/*</include> + <include>node2-api/**/*</include> + <include>node2-impl/**/*</include> + <include>node2-launcher/**/*</include> + <include>policy/**/*</include> + <include>policy-security/**/*</include> + <include>policy-xml/**/*</include> + <include>sca-api/**/*</include> + <include>xsd/**/*</include> + <include>xsd-xml/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>pom.xml</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </fileSet> </fileSets> </assembly> diff --git a/java/sca/distribution/features/generate-profile.sh b/java/sca/distribution/features/etc/generate-pom.sh index 1d847a164e..cf53e890d9 100755 --- a/java/sca/distribution/features/generate-profile.sh +++ b/java/sca/distribution/features/etc/generate-pom.sh @@ -20,7 +20,7 @@ # included directly or transitively in that distribution echo " <profile>" -echo " <id>distribution</id>" +echo " <id>modules</id>" echo " <modules>" unzip -v target/*-SNAPSHOT.zip | awk '/(.*)(\/modules\/tuscany-)(.*)(\..ar$)/ { print gensub("(.*)(/modules/tuscany-)(.*)(-...-SNAPSHOT.jar)", "\\3", "g")}' | sort | awk '{ printf " <module>../../../modules/%s</module>\n", $1 }' @@ -29,3 +29,12 @@ echo " </modules>" echo " </profile>" echo "" +# This generates a list of includes that can be included in a +# Maven assembly fileset, to include the source of the modules +# in a source distribution for example + +echo " <includes>" +unzip -v target/*-SNAPSHOT.zip | awk '/(.*)(\/modules\/tuscany-)(.*)(\..ar$)/ { print gensub("(.*)(/modules/tuscany-)(.*)(-...-SNAPSHOT.jar)", "\\3", "g")}' | sort | awk '{ printf " <include>%s/**/*</include>\n", $1 }' +echo " </includes>" +echo "" + diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml index 07c8e28c37..5990db5017 100644 --- a/java/sca/distribution/features/manager/pom.xml +++ b/java/sca/distribution/features/manager/pom.xml @@ -140,10 +140,78 @@ </dependencies> <profiles> - <!-- Profile to use to build distributions --> + <!-- Profile that can be used to build the modules included in the distro --> <profile> - <id>distribution</id> + <id>dependencies</id> <modules> + <module>../../../modules/assembly</module> + <module>../../../modules/assembly-xml</module> + <module>../../../modules/assembly-xsd</module> + <module>../../../modules/binding-atom</module> + <module>../../../modules/binding-atom-abdera</module> + <module>../../../modules/binding-ejb</module> + <module>../../../modules/binding-http</module> + <module>../../../modules/binding-jsonrpc</module> + <module>../../../modules/binding-rss</module> + <module>../../../modules/binding-sca</module> + <module>../../../modules/binding-sca-xml</module> + <module>../../../modules/binding-ws</module> + <module>../../../modules/binding-ws-wsdlgen</module> + <module>../../../modules/binding-ws-xml</module> + <module>../../../modules/contribution</module> + <module>../../../modules/contribution-impl</module> + <module>../../../modules/contribution-java</module> + <module>../../../modules/contribution-namespace</module> + <module>../../../modules/contribution-resource</module> + <module>../../../modules/contribution-xml</module> + <module>../../../modules/core</module> + <module>../../../modules/core-databinding</module> + <module>../../../modules/core-spi</module> + <module>../../../modules/data-api</module> + <module>../../../modules/databinding</module> + <module>../../../modules/databinding-jaxb</module> + <module>../../../modules/definitions</module> + <module>../../../modules/definitions-xml</module> + <module>../../../modules/distribution-core</module> + <module>../../../modules/distribution-manager</module> + <module>../../../modules/domain-manager</module> + <module>../../../modules/endpoint</module> + <module>../../../modules/extensibility</module> + <module>../../../modules/host-embedded</module> + <module>../../../modules/host-http</module> + <module>../../../modules/host-jetty</module> + <module>../../../modules/implementation-bpel</module> + <module>../../../modules/implementation-ejb</module> + <module>../../../modules/implementation-java</module> + <module>../../../modules/implementation-java-runtime</module> + <module>../../../modules/implementation-java-xml</module> + <module>../../../modules/implementation-node</module> + <module>../../../modules/implementation-node-runtime</module> + <module>../../../modules/implementation-resource</module> + <module>../../../modules/implementation-widget</module> + <module>../../../modules/implementation-widget-runtime</module> + <module>../../../modules/interface</module> + <module>../../../modules/interface-java</module> + <module>../../../modules/interface-java-jaxws</module> + <module>../../../modules/interface-java-xml</module> + <module>../../../modules/interface-wsdl</module> + <module>../../../modules/interface-wsdl-xml</module> + <module>../../../modules/monitor</module> + <module>../../../modules/monitor-logging</module> + <module>../../../modules/node2-api</module> + <module>../../../modules/node2-impl</module> + <module>../../../modules/node2-launcher</module> + <module>../../../modules/node-manager</module> + <module>../../../modules/policy</module> + <module>../../../modules/policy-security</module> + <module>../../../modules/policy-security-ws</module> + <module>../../../modules/policy-xml</module> + <module>../../../modules/sca-api</module> + <module>../../../modules/workspace</module> + <module>../../../modules/workspace-impl</module> + <module>../../../modules/workspace-xml</module> + <module>../../../modules/xsd</module> + <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/java/sca/distribution/features/manager/src/main/assembly/src.xml b/java/sca/distribution/features/manager/src/main/assembly/src.xml index 92734897e7..2dad1ffb3e 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/src.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/src.xml @@ -30,27 +30,6 @@ <format>zip</format> </formats> - <moduleSets> - <moduleSet> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Specific files/folders to exclude --> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </sources> - </moduleSet> - </moduleSets> - <fileSets> <fileSet> <directory>src/main/release</directory> @@ -71,6 +50,93 @@ <include>NOTICE</include> </includes> </fileSet> + + <!-- Add module sources to the modules directory --> + <fileSet> + <directory>../../../modules</directory> + <outputDirectory>modules</outputDirectory> + <includes> + <include>assembly/**/*</include> + <include>assembly-xml/**/*</include> + <include>assembly-xsd/**/*</include> + <include>binding-atom/**/*</include> + <include>binding-atom-abdera/**/*</include> + <include>binding-ejb/**/*</include> + <include>binding-http/**/*</include> + <include>binding-jsonrpc/**/*</include> + <include>binding-rss/**/*</include> + <include>binding-sca/**/*</include> + <include>binding-sca-xml/**/*</include> + <include>binding-ws/**/*</include> + <include>binding-ws-wsdlgen/**/*</include> + <include>binding-ws-xml/**/*</include> + <include>contribution/**/*</include> + <include>contribution-impl/**/*</include> + <include>contribution-java/**/*</include> + <include>contribution-namespace/**/*</include> + <include>contribution-resource/**/*</include> + <include>contribution-xml/**/*</include> + <include>core/**/*</include> + <include>core-databinding/**/*</include> + <include>core-spi/**/*</include> + <include>data-api/**/*</include> + <include>databinding/**/*</include> + <include>databinding-jaxb/**/*</include> + <include>definitions/**/*</include> + <include>definitions-xml/**/*</include> + <include>distribution-core/**/*</include> + <include>distribution-manager/**/*</include> + <include>domain-manager/**/*</include> + <include>endpoint/**/*</include> + <include>extensibility/**/*</include> + <include>host-embedded/**/*</include> + <include>host-http/**/*</include> + <include>host-jetty/**/*</include> + <include>implementation-bpel/**/*</include> + <include>implementation-ejb/**/*</include> + <include>implementation-java/**/*</include> + <include>implementation-java-runtime/**/*</include> + <include>implementation-java-xml/**/*</include> + <include>implementation-node/**/*</include> + <include>implementation-node-runtime/**/*</include> + <include>implementation-resource/**/*</include> + <include>implementation-widget/**/*</include> + <include>implementation-widget-runtime/**/*</include> + <include>interface/**/*</include> + <include>interface-java/**/*</include> + <include>interface-java-jaxws/**/*</include> + <include>interface-java-xml/**/*</include> + <include>interface-wsdl/**/*</include> + <include>interface-wsdl-xml/**/*</include> + <include>monitor/**/*</include> + <include>monitor-logging/**/*</include> + <include>node2-api/**/*</include> + <include>node2-impl/**/*</include> + <include>node2-launcher/**/*</include> + <include>node-manager/**/*</include> + <include>policy/**/*</include> + <include>policy-security/**/*</include> + <include>policy-security-ws/**/*</include> + <include>policy-xml/**/*</include> + <include>sca-api/**/*</include> + <include>workspace/**/*</include> + <include>workspace-impl/**/*</include> + <include>workspace-xml/**/*</include> + <include>xsd/**/*</include> + <include>xsd-xml/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>pom.xml</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </fileSet> </fileSets> </assembly> diff --git a/java/sca/distribution/features/pom.xml b/java/sca/distribution/features/pom.xml index b6c1ca1cb7..d202b1c795 100644 --- a/java/sca/distribution/features/pom.xml +++ b/java/sca/distribution/features/pom.xml @@ -30,39 +30,14 @@ <packaging>pom</packaging> <name>Apache Tuscany SCA Feature Distributions</name> - <build> - <defaultGoal>install</defaultGoal> - </build> + <modules> + <module>all</module> + <module>core</module> + <module>ejava</module> + <module>manager</module> + <module>process</module> + <module>web20</module> + <module>webservice</module> + </modules> - <profiles> - <!-- Profile to use to build distributions --> - <profile> - <id>distribution</id> - <modules> - <module>all</module> - <module>core</module> - <module>ejava</module> - <module>manager</module> - <module>process</module> - <module>web20</module> - <module>webservice</module> - </modules> - <properties> - <maven.test.skip>true</maven.test.skip> - </properties> - </profile> - - <profile> - <id>eclipse</id> - <modules> - <module>all</module> - <module>core</module> - <module>ejava</module> - <module>manager</module> - <module>process</module> - <module>web20</module> - <module>webservice</module> - </modules> - </profile> - </profiles> </project> diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml index c69155d8d9..a357e0bf7c 100644 --- a/java/sca/distribution/features/process/pom.xml +++ b/java/sca/distribution/features/process/pom.xml @@ -62,10 +62,71 @@ </dependencies> <profiles> - <!-- Profile to use to build distributions --> + <!-- Profile that can be used to build the modules included in the distro --> <profile> - <id>distribution</id> + <id>dependencies</id> <modules> + <module>../../../modules/assembly</module> + <module>../../../modules/assembly-xml</module> + <module>../../../modules/assembly-xsd</module> + <module>../../../modules/binding-sca</module> + <module>../../../modules/binding-sca-axis2</module> + <module>../../../modules/binding-sca-xml</module> + <module>../../../modules/binding-ws</module> + <module>../../../modules/binding-ws-axis2</module> + <module>../../../modules/binding-ws-wsdlgen</module> + <module>../../../modules/binding-ws-xml</module> + <module>../../../modules/contribution</module> + <module>../../../modules/contribution-impl</module> + <module>../../../modules/contribution-java</module> + <module>../../../modules/contribution-namespace</module> + <module>../../../modules/contribution-xml</module> + <module>../../../modules/core</module> + <module>../../../modules/core-databinding</module> + <module>../../../modules/core-spi</module> + <module>../../../modules/data-api</module> + <module>../../../modules/databinding</module> + <module>../../../modules/databinding-axiom</module> + <module>../../../modules/databinding-jaxb</module> + <module>../../../modules/databinding-jaxb-axiom</module> + <module>../../../modules/databinding-saxon</module> + <module>../../../modules/databinding-sdo</module> + <module>../../../modules/definitions</module> + <module>../../../modules/definitions-xml</module> + <module>../../../modules/distribution-core</module> + <module>../../../modules/distribution-process</module> + <module>../../../modules/distribution-webservice</module> + <module>../../../modules/endpoint</module> + <module>../../../modules/extensibility</module> + <module>../../../modules/host-embedded</module> + <module>../../../modules/host-http</module> + <module>../../../modules/host-jetty</module> + <module>../../../modules/implementation-bpel</module> + <module>../../../modules/implementation-bpel-ode</module> + <module>../../../modules/implementation-java</module> + <module>../../../modules/implementation-java-runtime</module> + <module>../../../modules/implementation-java-xml</module> + <module>../../../modules/implementation-node</module> + <module>../../../modules/implementation-node-runtime</module> + <module>../../../modules/implementation-xquery</module> + <module>../../../modules/interface</module> + <module>../../../modules/interface-java</module> + <module>../../../modules/interface-java-jaxws</module> + <module>../../../modules/interface-java-xml</module> + <module>../../../modules/interface-wsdl</module> + <module>../../../modules/interface-wsdl-xml</module> + <module>../../../modules/monitor</module> + <module>../../../modules/node2-api</module> + <module>../../../modules/node2-impl</module> + <module>../../../modules/node2-launcher</module> + <module>../../../modules/policy</module> + <module>../../../modules/policy-security</module> + <module>../../../modules/policy-security-ws</module> + <module>../../../modules/policy-xml</module> + <module>../../../modules/policy-xml-ws</module> + <module>../../../modules/sca-api</module> + <module>../../../modules/xsd</module> + <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/java/sca/distribution/features/process/src/main/assembly/src.xml b/java/sca/distribution/features/process/src/main/assembly/src.xml index 92734897e7..d42bcf322b 100644 --- a/java/sca/distribution/features/process/src/main/assembly/src.xml +++ b/java/sca/distribution/features/process/src/main/assembly/src.xml @@ -30,27 +30,6 @@ <format>zip</format> </formats> - <moduleSets> - <moduleSet> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Specific files/folders to exclude --> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </sources> - </moduleSet> - </moduleSets> - <fileSets> <fileSet> <directory>src/main/release</directory> @@ -71,6 +50,86 @@ <include>NOTICE</include> </includes> </fileSet> + + <!-- Add module sources to the modules directory --> + <fileSet> + <directory>../../../modules</directory> + <outputDirectory>modules</outputDirectory> + <includes> + <include>assembly/**/*</include> + <include>assembly-xml/**/*</include> + <include>assembly-xsd/**/*</include> + <include>binding-sca/**/*</include> + <include>binding-sca-axis2/**/*</include> + <include>binding-sca-xml/**/*</include> + <include>binding-ws/**/*</include> + <include>binding-ws-axis2/**/*</include> + <include>binding-ws-wsdlgen/**/*</include> + <include>binding-ws-xml/**/*</include> + <include>contribution/**/*</include> + <include>contribution-impl/**/*</include> + <include>contribution-java/**/*</include> + <include>contribution-namespace/**/*</include> + <include>contribution-xml/**/*</include> + <include>core/**/*</include> + <include>core-databinding/**/*</include> + <include>core-spi/**/*</include> + <include>data-api/**/*</include> + <include>databinding/**/*</include> + <include>databinding-axiom/**/*</include> + <include>databinding-jaxb/**/*</include> + <include>databinding-jaxb-axiom/**/*</include> + <include>databinding-saxon/**/*</include> + <include>databinding-sdo/**/*</include> + <include>definitions/**/*</include> + <include>definitions-xml/**/*</include> + <include>distribution-core/**/*</include> + <include>distribution-process/**/*</include> + <include>distribution-webservice/**/*</include> + <include>endpoint/**/*</include> + <include>extensibility/**/*</include> + <include>host-embedded/**/*</include> + <include>host-http/**/*</include> + <include>host-jetty/**/*</include> + <include>implementation-bpel/**/*</include> + <include>implementation-bpel-ode/**/*</include> + <include>implementation-java/**/*</include> + <include>implementation-java-runtime/**/*</include> + <include>implementation-java-xml/**/*</include> + <include>implementation-node/**/*</include> + <include>implementation-node-runtime/**/*</include> + <include>implementation-xquery/**/*</include> + <include>interface/**/*</include> + <include>interface-java/**/*</include> + <include>interface-java-jaxws/**/*</include> + <include>interface-java-xml/**/*</include> + <include>interface-wsdl/**/*</include> + <include>interface-wsdl-xml/**/*</include> + <include>monitor/**/*</include> + <include>node2-api/**/*</include> + <include>node2-impl/**/*</include> + <include>node2-launcher/**/*</include> + <include>policy/**/*</include> + <include>policy-security/**/*</include> + <include>policy-security-ws/**/*</include> + <include>policy-xml/**/*</include> + <include>policy-xml-ws/**/*</include> + <include>sca-api/**/*</include> + <include>xsd/**/*</include> + <include>xsd-xml/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>pom.xml</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </fileSet> </fileSets> </assembly> diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml index 67f8685fe2..49f54269a5 100644 --- a/java/sca/distribution/features/web20/pom.xml +++ b/java/sca/distribution/features/web20/pom.xml @@ -97,10 +97,70 @@ </dependencies> <profiles> - <!-- Profile to use to build distributions --> + <!-- Profile that can be used to build the modules included in the distro --> <profile> - <id>distribution</id> + <id>dependencies</id> <modules> + <module>../../../modules/assembly</module> + <module>../../../modules/assembly-xml</module> + <module>../../../modules/assembly-xsd</module> + <module>../../../modules/binding-atom</module> + <module>../../../modules/binding-atom-abdera</module> + <module>../../../modules/binding-http</module> + <module>../../../modules/binding-http-runtime</module> + <module>../../../modules/binding-jsonrpc</module> + <module>../../../modules/binding-jsonrpc-runtime</module> + <module>../../../modules/binding-rss</module> + <module>../../../modules/binding-rss-rome</module> + <module>../../../modules/binding-sca</module> + <module>../../../modules/binding-sca-xml</module> + <module>../../../modules/contribution</module> + <module>../../../modules/contribution-impl</module> + <module>../../../modules/contribution-java</module> + <module>../../../modules/contribution-namespace</module> + <module>../../../modules/contribution-resource</module> + <module>../../../modules/contribution-xml</module> + <module>../../../modules/core</module> + <module>../../../modules/core-databinding</module> + <module>../../../modules/core-spi</module> + <module>../../../modules/data-api</module> + <module>../../../modules/databinding</module> + <module>../../../modules/databinding-jaxb</module> + <module>../../../modules/databinding-json</module> + <module>../../../modules/definitions</module> + <module>../../../modules/definitions-xml</module> + <module>../../../modules/distribution-core</module> + <module>../../../modules/distribution-web20</module> + <module>../../../modules/endpoint</module> + <module>../../../modules/extensibility</module> + <module>../../../modules/host-embedded</module> + <module>../../../modules/host-http</module> + <module>../../../modules/host-jetty</module> + <module>../../../modules/implementation-java</module> + <module>../../../modules/implementation-java-runtime</module> + <module>../../../modules/implementation-java-xml</module> + <module>../../../modules/implementation-node</module> + <module>../../../modules/implementation-node-runtime</module> + <module>../../../modules/implementation-resource</module> + <module>../../../modules/implementation-resource-runtime</module> + <module>../../../modules/implementation-widget</module> + <module>../../../modules/implementation-widget-runtime</module> + <module>../../../modules/interface</module> + <module>../../../modules/interface-java</module> + <module>../../../modules/interface-java-jaxws</module> + <module>../../../modules/interface-java-xml</module> + <module>../../../modules/interface-wsdl</module> + <module>../../../modules/interface-wsdl-xml</module> + <module>../../../modules/monitor</module> + <module>../../../modules/node2-api</module> + <module>../../../modules/node2-impl</module> + <module>../../../modules/node2-launcher</module> + <module>../../../modules/policy</module> + <module>../../../modules/policy-security</module> + <module>../../../modules/policy-xml</module> + <module>../../../modules/sca-api</module> + <module>../../../modules/xsd</module> + <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/java/sca/distribution/features/web20/src/main/assembly/src.xml b/java/sca/distribution/features/web20/src/main/assembly/src.xml index 92734897e7..1b9cfee47a 100644 --- a/java/sca/distribution/features/web20/src/main/assembly/src.xml +++ b/java/sca/distribution/features/web20/src/main/assembly/src.xml @@ -30,27 +30,6 @@ <format>zip</format> </formats> - <moduleSets> - <moduleSet> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Specific files/folders to exclude --> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </sources> - </moduleSet> - </moduleSets> - <fileSets> <fileSet> <directory>src/main/release</directory> @@ -71,6 +50,85 @@ <include>NOTICE</include> </includes> </fileSet> + + <!-- Add module sources to the modules directory --> + <fileSet> + <directory>../../../modules</directory> + <outputDirectory>modules</outputDirectory> + <includes> + <include>assembly/**/*</include> + <include>assembly-xml/**/*</include> + <include>assembly-xsd/**/*</include> + <include>binding-atom/**/*</include> + <include>binding-atom-abdera/**/*</include> + <include>binding-http/**/*</include> + <include>binding-http-runtime/**/*</include> + <include>binding-jsonrpc/**/*</include> + <include>binding-jsonrpc-runtime/**/*</include> + <include>binding-rss/**/*</include> + <include>binding-rss-rome/**/*</include> + <include>binding-sca/**/*</include> + <include>binding-sca-xml/**/*</include> + <include>contribution/**/*</include> + <include>contribution-impl/**/*</include> + <include>contribution-java/**/*</include> + <include>contribution-namespace/**/*</include> + <include>contribution-resource/**/*</include> + <include>contribution-xml/**/*</include> + <include>core/**/*</include> + <include>core-databinding/**/*</include> + <include>core-spi/**/*</include> + <include>data-api/**/*</include> + <include>databinding/**/*</include> + <include>databinding-jaxb/**/*</include> + <include>databinding-json/**/*</include> + <include>definitions/**/*</include> + <include>definitions-xml/**/*</include> + <include>distribution-core/**/*</include> + <include>distribution-web20/**/*</include> + <include>endpoint/**/*</include> + <include>extensibility/**/*</include> + <include>host-embedded/**/*</include> + <include>host-http/**/*</include> + <include>host-jetty/**/*</include> + <include>implementation-java/**/*</include> + <include>implementation-java-runtime/**/*</include> + <include>implementation-java-xml/**/*</include> + <include>implementation-node/**/*</include> + <include>implementation-node-runtime/**/*</include> + <include>implementation-resource/**/*</include> + <include>implementation-resource-runtime/**/*</include> + <include>implementation-widget/**/*</include> + <include>implementation-widget-runtime/**/*</include> + <include>interface/**/*</include> + <include>interface-java/**/*</include> + <include>interface-java-jaxws/**/*</include> + <include>interface-java-xml/**/*</include> + <include>interface-wsdl/**/*</include> + <include>interface-wsdl-xml/**/*</include> + <include>monitor/**/*</include> + <include>node2-api/**/*</include> + <include>node2-impl/**/*</include> + <include>node2-launcher/**/*</include> + <include>policy/**/*</include> + <include>policy-security/**/*</include> + <include>policy-xml/**/*</include> + <include>sca-api/**/*</include> + <include>xsd/**/*</include> + <include>xsd-xml/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>pom.xml</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </fileSet> </fileSets> </assembly> diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml index 63c99558ad..3dccb46653 100644 --- a/java/sca/distribution/features/webservice/pom.xml +++ b/java/sca/distribution/features/webservice/pom.xml @@ -111,10 +111,65 @@ </dependencies> <profiles> - <!-- Profile to use to build distributions --> + <!-- Profile that can be used to build the modules included in the distro --> <profile> - <id>distribution</id> + <id>dependencies</id> <modules> + <module>../../../modules/assembly</module> + <module>../../../modules/assembly-xml</module> + <module>../../../modules/assembly-xsd</module> + <module>../../../modules/binding-sca</module> + <module>../../../modules/binding-sca-axis2</module> + <module>../../../modules/binding-sca-xml</module> + <module>../../../modules/binding-ws</module> + <module>../../../modules/binding-ws-axis2</module> + <module>../../../modules/binding-ws-wsdlgen</module> + <module>../../../modules/binding-ws-xml</module> + <module>../../../modules/contribution</module> + <module>../../../modules/contribution-impl</module> + <module>../../../modules/contribution-java</module> + <module>../../../modules/contribution-namespace</module> + <module>../../../modules/contribution-xml</module> + <module>../../../modules/core</module> + <module>../../../modules/core-databinding</module> + <module>../../../modules/core-spi</module> + <module>../../../modules/data-api</module> + <module>../../../modules/databinding</module> + <module>../../../modules/databinding-axiom</module> + <module>../../../modules/databinding-jaxb</module> + <module>../../../modules/databinding-jaxb-axiom</module> + <module>../../../modules/definitions</module> + <module>../../../modules/definitions-xml</module> + <module>../../../modules/distribution-core</module> + <module>../../../modules/distribution-webservice</module> + <module>../../../modules/endpoint</module> + <module>../../../modules/extensibility</module> + <module>../../../modules/host-embedded</module> + <module>../../../modules/host-http</module> + <module>../../../modules/host-jetty</module> + <module>../../../modules/implementation-java</module> + <module>../../../modules/implementation-java-runtime</module> + <module>../../../modules/implementation-java-xml</module> + <module>../../../modules/implementation-node</module> + <module>../../../modules/implementation-node-runtime</module> + <module>../../../modules/interface</module> + <module>../../../modules/interface-java</module> + <module>../../../modules/interface-java-jaxws</module> + <module>../../../modules/interface-java-xml</module> + <module>../../../modules/interface-wsdl</module> + <module>../../../modules/interface-wsdl-xml</module> + <module>../../../modules/monitor</module> + <module>../../../modules/node2-api</module> + <module>../../../modules/node2-impl</module> + <module>../../../modules/node2-launcher</module> + <module>../../../modules/policy</module> + <module>../../../modules/policy-security</module> + <module>../../../modules/policy-security-ws</module> + <module>../../../modules/policy-xml</module> + <module>../../../modules/policy-xml-ws</module> + <module>../../../modules/sca-api</module> + <module>../../../modules/xsd</module> + <module>../../../modules/xsd-xml</module> </modules> </profile> </profiles> diff --git a/java/sca/distribution/features/webservice/src/main/assembly/src.xml b/java/sca/distribution/features/webservice/src/main/assembly/src.xml index 92734897e7..154ff4927b 100644 --- a/java/sca/distribution/features/webservice/src/main/assembly/src.xml +++ b/java/sca/distribution/features/webservice/src/main/assembly/src.xml @@ -30,27 +30,6 @@ <format>zip</format> </formats> - <moduleSets> - <moduleSet> - <sources> - <includeModuleDirectory>true</includeModuleDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Specific files/folders to exclude --> - <exclude>**/target</exclude> - <exclude>**/target/**/*</exclude> - </excludes> - </sources> - </moduleSet> - </moduleSets> - <fileSets> <fileSet> <directory>src/main/release</directory> @@ -71,6 +50,80 @@ <include>NOTICE</include> </includes> </fileSet> + + <!-- Add module sources to the modules directory --> + <fileSet> + <directory>../../../modules</directory> + <outputDirectory>modules</outputDirectory> + <includes> + <include>assembly/**/*</include> + <include>assembly-xml/**/*</include> + <include>assembly-xsd/**/*</include> + <include>binding-sca/**/*</include> + <include>binding-sca-axis2/**/*</include> + <include>binding-sca-xml/**/*</include> + <include>binding-ws/**/*</include> + <include>binding-ws-axis2/**/*</include> + <include>binding-ws-wsdlgen/**/*</include> + <include>binding-ws-xml/**/*</include> + <include>contribution/**/*</include> + <include>contribution-impl/**/*</include> + <include>contribution-java/**/*</include> + <include>contribution-namespace/**/*</include> + <include>contribution-xml/**/*</include> + <include>core/**/*</include> + <include>core-databinding/**/*</include> + <include>core-spi/**/*</include> + <include>data-api/**/*</include> + <include>databinding/**/*</include> + <include>databinding-axiom/**/*</include> + <include>databinding-jaxb/**/*</include> + <include>databinding-jaxb-axiom/**/*</include> + <include>definitions/**/*</include> + <include>definitions-xml/**/*</include> + <include>distribution-core/**/*</include> + <include>distribution-webservice/**/*</include> + <include>endpoint/**/*</include> + <include>extensibility/**/*</include> + <include>host-embedded/**/*</include> + <include>host-http/**/*</include> + <include>host-jetty/**/*</include> + <include>implementation-java/**/*</include> + <include>implementation-java-runtime/**/*</include> + <include>implementation-java-xml/**/*</include> + <include>implementation-node/**/*</include> + <include>implementation-node-runtime/**/*</include> + <include>interface/**/*</include> + <include>interface-java/**/*</include> + <include>interface-java-jaxws/**/*</include> + <include>interface-java-xml/**/*</include> + <include>interface-wsdl/**/*</include> + <include>interface-wsdl-xml/**/*</include> + <include>monitor/**/*</include> + <include>node2-api/**/*</include> + <include>node2-impl/**/*</include> + <include>node2-launcher/**/*</include> + <include>policy/**/*</include> + <include>policy-security/**/*</include> + <include>policy-security-ws/**/*</include> + <include>policy-xml/**/*</include> + <include>policy-xml-ws/**/*</include> + <include>sca-api/**/*</include> + <include>xsd/**/*</include> + <include>xsd-xml/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Specific files/folders to exclude --> + <exclude>pom.xml</exclude> + <exclude>**/target</exclude> + <exclude>**/target/**/*</exclude> + </excludes> + </fileSet> </fileSets> </assembly> |