diff options
Diffstat (limited to '')
5 files changed, 157 insertions, 183 deletions
diff --git a/java/sca/distribution/features/manager/pom.xml b/java/sca/distribution/features/manager/pom.xml index 898301679a..627f9e3902 100644 --- a/java/sca/distribution/features/manager/pom.xml +++ b/java/sca/distribution/features/manager/pom.xml @@ -31,13 +31,14 @@ <packaging>pom</packaging> <dependencies> - + <!-- Core distribution --> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-distribution-core</artifactId> <type>pom</type> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <!-- Binding Models --> @@ -45,36 +46,43 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-atom</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ejb</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-http</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-jsonrpc</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-rss</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-sca-xml</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-binding-ws-xml</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <!-- Contribution models --> @@ -82,16 +90,19 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution-java</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution-namespace</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-contribution-resource</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <!-- Domain support --> @@ -99,11 +110,13 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-domain-manager</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-node-manager</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <!-- Implementation Models --> @@ -111,31 +124,37 @@ <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-bpel</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-ejb</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-java-xml</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-node</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-resource</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.tuscany.sca</groupId> <artifactId>tuscany-implementation-widget</artifactId> <version>1.4-SNAPSHOT</version> + <scope>runtime</scope> </dependency> </dependencies> diff --git a/java/sca/distribution/features/manager/src/main/assembly/bin.xml b/java/sca/distribution/features/manager/src/main/assembly/bin.xml index 18f44c6277..85c8de5239 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/bin.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/bin.xml @@ -30,77 +30,9 @@ <format>zip</format> </formats> - <fileSets> - - <!-- Add the text files to the top-level directroy --> - <fileSet> - <directory>src/main/release</directory> - <outputDirectory></outputDirectory> - <includes> - <include>CHANGES</include> - <include>DISCLAIMER</include> - <include>README</include> - <include>RELEASE_NOTES</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/release/bin</directory> - <outputDirectory></outputDirectory> - <includes> - <include>INSTALL</include> - <include>LICENSE</include> - <include>NOTICE</include> - </includes> - </fileSet> - - <!-- Add the node launcher webapp to the modules directory --> - <fileSet> - <directory>../../sca/modules/node2-launcher-webapp/target</directory> - <outputDirectory>modules</outputDirectory> - <includes> - <include>*.war</include> - </includes> - </fileSet> - - <!-- Add samples to the samples directory --> - <fileSet> - <directory>../../sca/samples</directory> - <outputDirectory>samples</outputDirectory> - <includes> - <include>domain-management/**/*</include> - </includes> - <excludes> - <!-- General file/folders to exclude --> - <exclude>**/.*</exclude> - <exclude>**/.*/**</exclude> - <exclude>**/*.log</exclude> - - <!-- Sample specific files/folders to exclude --> - <exclude>pom.xml</exclude> - </excludes> - </fileSet> - </fileSets> - - <dependencySets> - - <!-- Add all the Tuscany modules to the modules directory --> - <dependencySet> - <outputDirectory>modules</outputDirectory> - <unpack>false</unpack> - <includes> - <include>org.apache.tuscany.sca:*</include> - </includes> - </dependencySet> - - <!-- Add all the dependent jars to the lib directory --> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <unpack>false</unpack> - <excludes> - <exclude>org.apache.tuscany.sca:*</exclude> - </excludes> - </dependencySet> - - </dependencySets> - + <componentDescriptors> + <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor> + <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor> + <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor> + </componentDescriptors> </assembly> 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 2dad1ffb3e..0d832271b9 100644 --- a/java/sca/distribution/features/manager/src/main/assembly/src.xml +++ b/java/sca/distribution/features/manager/src/main/assembly/src.xml @@ -30,113 +30,8 @@ <format>zip</format> </formats> - <fileSets> - <fileSet> - <directory>src/main/release</directory> - <outputDirectory></outputDirectory> - <includes> - <include>CHANGES</include> - <include>DISCLAIMER</include> - <include>README</include> - <include>RELEASE_NOTES</include> - </includes> - </fileSet> - <fileSet> - <directory>src/main/release/src</directory> - <outputDirectory></outputDirectory> - <includes> - <include>BUILDING</include> - <include>LICENSE</include> - <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> - + <componentDescriptors> + <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor> + <componentDescriptor>src/main/components/src-modules.xml</componentDescriptor> + </componentDescriptors> </assembly> diff --git a/java/sca/distribution/features/manager/src/main/components/bin-samples.xml b/java/sca/distribution/features/manager/src/main/components/bin-samples.xml new file mode 100644 index 0000000000..d4b13c42e0 --- /dev/null +++ b/java/sca/distribution/features/manager/src/main/components/bin-samples.xml @@ -0,0 +1,42 @@ +<!-- + * 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 samples to the samples directory --> + <fileSet> + <directory>../../../samples</directory> + <outputDirectory>samples</outputDirectory> + <includes> + <include>domain-management/**/*</include> + </includes> + <excludes> + <!-- General file/folders to exclude --> + <exclude>**/.*</exclude> + <exclude>**/.*/**</exclude> + <exclude>**/*.log</exclude> + + <!-- Sample 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/manager/src/main/components/src-modules.xml b/java/sca/distribution/features/manager/src/main/components/src-modules.xml new file mode 100644 index 0000000000..2dc74ba335 --- /dev/null +++ b/java/sca/distribution/features/manager/src/main/components/src-modules.xml @@ -0,0 +1,86 @@ +<!-- + * 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-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>monitor-logging/**/*</include> + <include>node-api/**/*</include> + <include>node-impl/**/*</include> + <include>node-launcher/**/*</include> + <include>node-launcher-webapp/**/*</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> +</component> |