diff options
Diffstat (limited to '')
20 files changed, 297 insertions, 42 deletions
diff --git a/java/sca/distribution/features/all/pom.xml b/java/sca/distribution/features/all/pom.xml index f843dd9dee..94b0cb8931 100644 --- a/java/sca/distribution/features/all/pom.xml +++ b/java/sca/distribution/features/all/pom.xml @@ -72,6 +72,7 @@ </dependencies> <profiles> + <!-- Profile that can be used to build the modules included in the distro --> <profile> <id>modules</id> @@ -117,13 +118,13 @@ <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/distribution-webservice</module> <module>../../../modules/domain-manager</module> <module>../../../modules/endpoint</module> <module>../../../modules/extensibility</module> @@ -155,9 +156,10 @@ <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-api</module> + <module>../../../modules/node-impl</module> + <module>../../../modules/node-launcher</module> + <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/node-manager</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> 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 new file mode 100644 index 0000000000..a7e0b4ccef --- /dev/null +++ b/java/sca/distribution/features/all/src/main/components/src-modules.xml @@ -0,0 +1,137 @@ +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * License); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * AS IS BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<component> + <fileSets> + + <!-- 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-core/**/*</include> + <include>distribution-ejava/**/*</include> + <include>distribution-manager/**/*</include> + <include>distribution-process/**/*</include> + <include>distribution-web20/**/*</include> + <include>distribution-webservice/**/*</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>node-api/**/*</include> + <include>node-impl/**/*</include> + <include>node-launcher/**/*</include> + <include>node-launcher-webapp/**/*</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> +</component> + diff --git a/java/sca/distribution/features/core/pom.xml b/java/sca/distribution/features/core/pom.xml index 9295d20690..ddb0efbbaa 100644 --- a/java/sca/distribution/features/core/pom.xml +++ b/java/sca/distribution/features/core/pom.xml @@ -213,6 +213,7 @@ </dependencies> <profiles> + <!-- Profile that can be used to build the modules included in the distro --> <profile> <id>modules</id> diff --git a/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml b/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml index 94f9cf6e2e..1bcab2a9e3 100644 --- a/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml +++ b/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml @@ -73,7 +73,6 @@ <exclude>org.apache.tuscany.sca:tuscany-sca-api</exclude> <exclude>org.apache.tuscany.sca:tuscany-xsd</exclude> <exclude>org.apache.tuscany.sca:tuscany-xsd-xml</exclude> - <exclude>org.apache.tuscany.sca:tuscany-distribution-core:pom</exclude> </excludes> </dependencySet> @@ -101,3 +100,4 @@ </dependencySet> </dependencySets> </component> + diff --git a/java/sca/distribution/features/core/src/main/components/src-modules.xml b/java/sca/distribution/features/core/src/main/components/src-modules.xml index 2dc74ba335..65f356ad0f 100644 --- a/java/sca/distribution/features/core/src/main/components/src-modules.xml +++ b/java/sca/distribution/features/core/src/main/components/src-modules.xml @@ -84,3 +84,4 @@ </fileSet> </fileSets> </component> + diff --git a/java/sca/distribution/features/ejava/pom.xml b/java/sca/distribution/features/ejava/pom.xml index 17948aca58..302041bda9 100644 --- a/java/sca/distribution/features/ejava/pom.xml +++ b/java/sca/distribution/features/ejava/pom.xml @@ -73,6 +73,7 @@ </dependencies> <profiles> + <!-- Profile that can be used to build the modules included in the distro --> <profile> <id>modules</id> @@ -101,7 +102,6 @@ <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> @@ -123,9 +123,11 @@ <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/monitor-logging</module> + <module>../../../modules/node-api</module> + <module>../../../modules/node-impl</module> + <module>../../../modules/node-launcher</module> + <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> <module>../../../modules/policy-xml</module> 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 2dc74ba335..84ddf42be0 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 @@ -27,6 +27,10 @@ <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> @@ -39,18 +43,25 @@ <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>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> @@ -84,3 +95,4 @@ </fileSet> </fileSets> </component> + diff --git a/java/sca/distribution/features/etc/generate-all-maven-files.sh b/java/sca/distribution/features/etc/generate-all-maven-files.sh new file mode 100755 index 0000000000..d80368b90c --- /dev/null +++ b/java/sca/distribution/features/etc/generate-all-maven-files.sh @@ -0,0 +1,41 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +# This script can be used to generate Maven build POM and assembly files +# for all the distributions + +echo "Generate Maven files: core" +cd core; ../etc/generate-down-dependencies.sh > src/main/components/bin-down-dependencies.xml; ../etc/generate-maven-files.sh + +echo "Generate Maven files: ejava" +cd ../ejava; ../etc/generate-maven-files.sh + +echo "Generate Maven files: manager" +cd ../manager; ../etc/generate-maven-files.sh + +echo "Generate Maven files: process" +cd ../process; ../etc/generate-maven-files.sh + +echo "Generate Maven files: web20" +cd ../web20; ../etc/generate-maven-files.sh + +echo "Generate Maven files: webservice" +cd ../webservice; ../etc/generate-maven-files.sh + +echo "Generate Maven files: all" +cd ../all; ../etc/generate-maven-files.sh + diff --git a/java/sca/distribution/features/etc/generate-down-dependencies.sh b/java/sca/distribution/features/etc/generate-down-dependencies.sh index 9898835c25..d8ad5b75f3 100755 --- a/java/sca/distribution/features/etc/generate-down-dependencies.sh +++ b/java/sca/distribution/features/etc/generate-down-dependencies.sh @@ -48,7 +48,9 @@ echo " <includes>" echo " <include>org.apache.tuscany.sca:*</include>" echo " </includes>" echo " <excludes>" + mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO. )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf " <exclude>%s</exclude>\n", $1 }' + echo " </excludes>" echo " </dependencySet>" echo "" @@ -58,13 +60,12 @@ echo " <outputDirectory>lib</outputDirectory>" echo " <unpack>false</unpack>" echo " <useTransitiveFiltering>true</useTransitiveFiltering>" echo " <excludes>" + mvn -o dependency:list | awk '/.INFO. (.*):(.*):(.*):(.*):(.*)/ && !/(.*)(.tuscany.sca):(.*)/ { print gensub("(.INFO. )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort | awk '{ printf " <exclude>%s</exclude>\n", $1 }' + echo " <exclude>org.apache.tuscany.sca:*</exclude>" echo " </excludes>" echo " </dependencySet>" echo " </dependencySets>" - - echo "</component>" -echo "" diff --git a/java/sca/distribution/features/etc/generate-maven-files.sh b/java/sca/distribution/features/etc/generate-maven-files.sh index ecff6aeab0..adb190eabd 100755 --- a/java/sca/distribution/features/etc/generate-maven-files.sh +++ b/java/sca/distribution/features/etc/generate-maven-files.sh @@ -19,5 +19,7 @@ # for a distribution ../etc/generate-src-modules.sh > src/main/components/src-modules.xml -../etc/generate-pom.sh > pom.xml +../etc/generate-pom.sh > pom.xml.tmp +cp pom.xml.tmp pom.xml +rm pom.xml.tmp diff --git a/java/sca/distribution/features/etc/generate-pom.sh b/java/sca/distribution/features/etc/generate-pom.sh index b901f8cffc..2a198eb3f2 100755 --- a/java/sca/distribution/features/etc/generate-pom.sh +++ b/java/sca/distribution/features/etc/generate-pom.sh @@ -20,6 +20,8 @@ cat pom.xml | awk 'BEGIN { i=0 } /<profiles>/ { 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>" @@ -28,7 +30,6 @@ mvn -o dependency:list | awk '/.INFO. (.*.tuscany.sca):(tuscany-)(.*):(.*):(. echo " </modules>" echo " </profile>" -echo "" cat pom.xml | awk 'BEGIN { i=0 } /<\/profiles>/ { i=1 } /.*/ { if (i==1) print } ' diff --git a/java/sca/distribution/features/etc/generate-src-modules.sh b/java/sca/distribution/features/etc/generate-src-modules.sh index 198636993d..60dbbcd2d0 100755 --- a/java/sca/distribution/features/etc/generate-src-modules.sh +++ b/java/sca/distribution/features/etc/generate-src-modules.sh @@ -62,5 +62,4 @@ echo " </excludes>" echo " </fileSet>" echo " </fileSets>" echo "</component>" -echo "" diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml index 627f9e3902..fbe21edd6d 100644 --- a/java/sca/distribution/features/manager/pom.xml +++ b/java/sca/distribution/features/manager/pom.xml @@ -159,6 +159,7 @@ </dependencies> <profiles> + <!-- Profile that can be used to build the modules included in the distro --> <profile> <id>modules</id> @@ -192,7 +193,6 @@ <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> @@ -217,9 +217,10 @@ <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-api</module> + <module>../../../modules/node-impl</module> + <module>../../../modules/node-launcher</module> + <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/node-manager</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> 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 2dc74ba335..55ab42eb59 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 @@ -27,12 +27,22 @@ <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> @@ -42,15 +52,23 @@ <include>databinding-jaxb/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> + <include>distribution-core/**/*</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> @@ -63,10 +81,15 @@ <include>node-impl/**/*</include> <include>node-launcher/**/*</include> <include>node-launcher-webapp/**/*</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> @@ -84,3 +107,4 @@ </fileSet> </fileSets> </component> + diff --git a/java/sca/distribution/features/process/pom.xml b/java/sca/distribution/features/process/pom.xml index 36508597fb..59c6f98e9a 100644 --- a/java/sca/distribution/features/process/pom.xml +++ b/java/sca/distribution/features/process/pom.xml @@ -54,6 +54,7 @@ </dependencies> <profiles> + <!-- Profile that can be used to build the modules included in the distro --> <profile> <id>modules</id> @@ -62,12 +63,7 @@ <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> @@ -78,21 +74,16 @@ <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> @@ -108,14 +99,14 @@ <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/monitor-logging</module> + <module>../../../modules/node-api</module> + <module>../../../modules/node-impl</module> + <module>../../../modules/node-launcher</module> + <module>../../../modules/node-launcher-webapp</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> 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 2dc74ba335..8be3c5ca29 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 @@ -40,17 +40,23 @@ <include>data-api/**/*</include> <include>databinding/**/*</include> <include>databinding-jaxb/**/*</include> + <include>databinding-saxon/**/*</include> + <include>databinding-sdo/**/*</include> <include>definitions/**/*</include> <include>definitions-xml/**/*</include> + <include>distribution-core/**/*</include> <include>endpoint/**/*</include> <include>extensibility/**/*</include> <include>host-embedded/**/*</include> <include>host-http/**/*</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> @@ -84,3 +90,4 @@ </fileSet> </fileSets> </component> + diff --git a/java/sca/distribution/features/web20/pom.xml b/java/sca/distribution/features/web20/pom.xml index 0b7e82ffe7..5da456d5a9 100644 --- a/java/sca/distribution/features/web20/pom.xml +++ b/java/sca/distribution/features/web20/pom.xml @@ -97,6 +97,7 @@ </dependencies> <profiles> + <!-- Profile that can be used to build the modules included in the distro --> <profile> <id>modules</id> @@ -130,7 +131,6 @@ <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> @@ -152,9 +152,11 @@ <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/monitor-logging</module> + <module>../../../modules/node-api</module> + <module>../../../modules/node-impl</module> + <module>../../../modules/node-launcher</module> + <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> <module>../../../modules/policy-xml</module> 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 2dc74ba335..cfef6f1c56 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 @@ -27,12 +27,21 @@ <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> @@ -40,17 +49,24 @@ <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>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> @@ -84,3 +100,4 @@ </fileSet> </fileSets> </component> + diff --git a/java/sca/distribution/features/webservice/pom.xml b/java/sca/distribution/features/webservice/pom.xml index 3bfc13e4f7..4ca873f418 100644 --- a/java/sca/distribution/features/webservice/pom.xml +++ b/java/sca/distribution/features/webservice/pom.xml @@ -111,6 +111,7 @@ </dependencies> <profiles> + <!-- Profile that can be used to build the modules included in the distro --> <profile> <id>modules</id> @@ -141,7 +142,6 @@ <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> @@ -159,9 +159,11 @@ <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/monitor-logging</module> + <module>../../../modules/node-api</module> + <module>../../../modules/node-impl</module> + <module>../../../modules/node-launcher</module> + <module>../../../modules/node-launcher-webapp</module> <module>../../../modules/policy</module> <module>../../../modules/policy-security</module> <module>../../../modules/policy-security-ws</module> 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 2dc74ba335..131689b610 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 @@ -28,7 +28,12 @@ <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> @@ -39,13 +44,17 @@ <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>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> @@ -65,7 +74,9 @@ <include>node-launcher-webapp/**/*</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> @@ -84,3 +95,4 @@ </fileSet> </fileSets> </component> + |