From 3a0138dfe6d44aa052dfacfde57ca5361e820733 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 6 Feb 2009 08:17:30 +0000
Subject: Tidy up the distro build

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@741465 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca/distribution/all/src/main/assembly/bin.xml | 17 ++----
 .../all/src/main/components/bin-common.xml         | 44 +++++++++++++++
 .../all/src/main/components/bin-modules.xml        | 33 +++++++++++
 .../all/src/main/components/bin-samples.xml        | 65 ++++++++++++++++++++++
 4 files changed, 146 insertions(+), 13 deletions(-)
 create mode 100644 java/sca/distribution/all/src/main/components/bin-common.xml
 create mode 100644 java/sca/distribution/all/src/main/components/bin-modules.xml
 create mode 100644 java/sca/distribution/all/src/main/components/bin-samples.xml

(limited to 'java/sca')

diff --git a/java/sca/distribution/all/src/main/assembly/bin.xml b/java/sca/distribution/all/src/main/assembly/bin.xml
index 350948cb6f..df1e94c3c5 100644
--- a/java/sca/distribution/all/src/main/assembly/bin.xml
+++ b/java/sca/distribution/all/src/main/assembly/bin.xml
@@ -28,18 +28,9 @@
     </formats>
 
     <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-modules.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../ejava/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../all/src/main/components/bin-launcher.xml</componentDescriptor>
-
-<!--
-        <componentDescriptor>../webapp/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../manager/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../process/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../web20/src/main/components/bin-samples.xml</componentDescriptor>
--->
+        <componentDescriptor>src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-modules.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
+        <componentDescriptor>src/main/components/bin-launcher.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>
diff --git a/java/sca/distribution/all/src/main/components/bin-common.xml b/java/sca/distribution/all/src/main/components/bin-common.xml
new file mode 100644
index 0000000000..c69e8e3699
--- /dev/null
+++ b/java/sca/distribution/all/src/main/components/bin-common.xml
@@ -0,0 +1,44 @@
+<!--
+    * 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 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>
+    </fileSets>
+
+</component>
diff --git a/java/sca/distribution/all/src/main/components/bin-modules.xml b/java/sca/distribution/all/src/main/components/bin-modules.xml
new file mode 100644
index 0000000000..69ec47740a
--- /dev/null
+++ b/java/sca/distribution/all/src/main/components/bin-modules.xml
@@ -0,0 +1,33 @@
+<!--
+    * 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>
+
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory>/</outputDirectory>
+            <includes>
+                <include>modules/**/*</include>
+                <include>features/**/*</include>
+            </includes>
+        </fileSet>
+
+    </fileSets>
+
+</component>
diff --git a/java/sca/distribution/all/src/main/components/bin-samples.xml b/java/sca/distribution/all/src/main/components/bin-samples.xml
new file mode 100644
index 0000000000..ccde704f5d
--- /dev/null
+++ b/java/sca/distribution/all/src/main/components/bin-samples.xml
@@ -0,0 +1,65 @@
+<!--
+    * 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 top level samples files -->
+        <fileSet>
+            <directory>../../samples</directory>
+            <outputDirectory>samples</outputDirectory>
+            <includes>
+                <include>README</include>
+                <include>logging.properties</include>
+                <include>build-common.xml</include>
+                <include>binding-ws-calculator/**/*</include>
+                <include>calculator/**/*</include>
+                <include>calculator-equinox/**/*</include>
+                <include>calculator-osgi/**/*</include>
+                <include>calculator-rmi-reference/**/*</include>
+                <include>calculator-rmi-service/**/*</include>
+                <include>implementation-java-calculator/**/*</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 -->
+                <exclude>*/target/mvn-eclipse-cache.properties</exclude>
+                <exclude>*/target/classes</exclude>
+                <exclude>*/target/classes/**/*</exclude>
+                <exclude>*/target/dependency-maven-plugin-markers</exclude>
+                <exclude>*/target/dependency-maven-plugin-markers/**/*</exclude>
+                <exclude>*/target/.felix</exclude>
+                <exclude>*/target/.felix/**/*</exclude>
+                <exclude>*/target/maven-archiver</exclude>
+                <exclude>*/target/maven-archiver/**/*</exclude>
+                <exclude>*/target/test-classes</exclude>
+                <exclude>*/target/test-classes/**/*</exclude>
+                <exclude>*/target/surefire-reports</exclude>
+                <exclude>*/target/surefire-reports/**/*</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+</component>
-- 
cgit v1.2.3