Adjust the core distro to include additional artifacts

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@736378 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 197 insertions, 185 deletions

diff --git a/java/sca/distribution/core/src/main/components/bin-modules.xml b/java/sca/distribution/core/src/main/components/bin-modules.xml
index 5e1c5ec5d6..703c729e90 100644
--- a/java/sca/distribution/core/src/main/components/bin-modules.xml
+++ b/java/sca/distribution/core/src/main/components/bin-modules.xml
@@ -1,32 +1,40 @@
-<!--
-    * 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 modules to the modules directory -->
-        <fileSet>
-            <directory>target/modules</directory>
-            <outputDirectory>modules</outputDirectory>
-            <includes>
-                <include>**/*</include>
-            </includes>
-        </fileSet>
-    </fileSets>
-
-</component>
+<!--

+    * 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 modules to the modules directory -->

+        <fileSet>

+            <directory>target/modules</directory>

+            <outputDirectory>modules</outputDirectory>

+            <includes>

+                <include>**/*</include>

+            </includes>

+        </fileSet>

+        <fileSet>

+            <directory>target/startup</directory>

+            <outputDirectory>startup</outputDirectory>

+            <includes>

+                <include>**/*</include>

+            </includes>

+        </fileSet>

+

+    </fileSets>

+

+</component>

diff --git a/java/sca/distribution/core/src/main/components/bin-samples.xml b/java/sca/distribution/core/src/main/components/bin-samples.xml
index 0d4e296bb4..5d368f075a 100644
--- a/java/sca/distribution/core/src/main/components/bin-samples.xml
+++ b/java/sca/distribution/core/src/main/components/bin-samples.xml
@@ -1,59 +1,63 @@
-<!--
-    * 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>README</include>
-                <include>logging.properties</include>
-                <include>calculator-equinox/**/*</include>
-                <!--include>calculator/**/*</include>
-                <include>calculator-lean/**/*</include>
-                <include>binding-echo/**/*</include>
-                <include>binding-echo-extension/**/*</include>
-                <include>databinding-echo/**/*</include>
-                <include>implementation-composite/**/*</include>
-                <include>implementation-crud/**/*</include>
-                <include>implementation-crud-extension/**/*</include>
-                <include>implementation-pojo-extension/**/*</include>
-                <include>loanapplication/**/*</include>
-                <include>simple-bigbank/**/*</include>
-                <include>simple-callback/**/*</include>
-                <include>supplychain/**/*</include-->
-            </includes>
-            <excludes>
-                <!-- General file/folders to exclude -->
-                <exclude>**/.*</exclude>
-                <exclude>**/.*/**</exclude>
-                <exclude>**/*.log</exclude>
-                <exclude>**/*.svg</exclude>
-                <exclude>**/maven-eclipse.xml</exclude>
-
-                <!-- Sample specific files/folders to exclude -->
-                <exclude>pom.xml</exclude>
-                <exclude>**/target</exclude>
-                <exclude>**/target/**/*</exclude>
-            </excludes>
-        </fileSet>
-    </fileSets>
-</component>
+<!--

+    * 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>README</include>

+                <include>logging.properties</include>

+                <include>calculator/**/*</include>

+                <include>calculator-equinox/**/*</include>

+                <include>calculator-osgi/**/*</include>

+<!--

+                <include>calculator/**/*</include>

+                <include>calculator-lean/**/*</include>

+                <include>binding-echo/**/*</include>

+                <include>binding-echo-extension/**/*</include>

+                <include>databinding-echo/**/*</include>

+                <include>implementation-composite/**/*</include>

+                <include>implementation-crud/**/*</include>

+                <include>implementation-crud-extension/**/*</include>

+                <include>implementation-pojo-extension/**/*</include>

+                <include>loanapplication/**/*</include>

+                <include>simple-bigbank/**/*</include>

+                <include>simple-callback/**/*</include>

+                <include>supplychain/**/*</include>

+-->

+            </includes>

+            <excludes>

+                <!-- General file/folders to exclude -->

+                <exclude>**/.*</exclude>

+                <exclude>**/.*/**</exclude>

+                <exclude>**/*.log</exclude>

+                <exclude>**/*.svg</exclude>

+                <exclude>**/maven-eclipse.xml</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/core/src/main/components/src-modules.xml b/java/sca/distribution/core/src/main/components/src-modules.xml
index 3a091b567b..02b7f2ff86 100644
--- a/java/sca/distribution/core/src/main/components/src-modules.xml
+++ b/java/sca/distribution/core/src/main/components/src-modules.xml
@@ -1,94 +1,94 @@
-<!--
-    * 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-corba/**/*</include>
-                <include>binding-corba-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-jaxb/**/*</include>
-                <include>definitions/**/*</include>
-                <include>definitions-xml/**/*</include>
-                <include>endpoint/**/*</include>
-                <include>extensibility/**/*</include>
-                <include>extensibility-equinox/**/*</include>
-                <include>host-corba/**/*</include>
-                <include>host-corba-jse/**/*</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>node-api/**/*</include>
-                <include>node-impl/**/*</include>
-                <include>node-launcher/**/*</include>
-                <include>node-launcher-equinox/**/*</include>
-                <include>node-launcher-webapp/**/*</include>
-                <include>policy/**/*</include>
-                <include>policy-security/**/*</include>
-                <include>policy-security-jsr250/**/*</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>
-</component>
+<!--

+    * 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-corba/**/*</include>

+                <include>binding-corba-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-jaxb/**/*</include>

+                <include>definitions/**/*</include>

+                <include>definitions-xml/**/*</include>

+                <include>endpoint/**/*</include>

+                <include>extensibility/**/*</include>

+                <include>extensibility-equinox/**/*</include>

+                <include>host-corba/**/*</include>

+                <include>host-corba-jse/**/*</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>node-api/**/*</include>

+                <include>node-impl/**/*</include>

+                <include>node-launcher/**/*</include>

+                <include>node-launcher-equinox/**/*</include>

+                <include>node-launcher-webapp/**/*</include>

+                <include>policy/**/*</include>

+                <include>policy-security/**/*</include>

+                <include>policy-security-jsr250/**/*</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>

+</component>