Add the samples implementation-java-calculator, binding-ws-calculator, host-webapp-calculator to the distribution.

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

2 files changed, 53 insertions, 63 deletions

diff --git a/java/sca/distribution/core/pom.xml b/java/sca/distribution/core/pom.xml
index 608d5cf7ef..ef52039b20 100644
--- a/java/sca/distribution/core/pom.xml
+++ b/java/sca/distribution/core/pom.xml
@@ -263,6 +263,9 @@
         <!-- Build profile that can be used to build the distro packages -->

         <profile>

             <id>distribution</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

             <build>

                 <plugins>

                     <plugin>

@@ -305,6 +308,7 @@
                             </execution>

                         </executions>

                     </plugin>

+

                 </plugins>

             </build>

         </profile>

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 5d368f075a..1bb22d3d15 100644
--- a/java/sca/distribution/core/src/main/components/bin-samples.xml
+++ b/java/sca/distribution/core/src/main/components/bin-samples.xml
@@ -1,63 +1,49 @@
-<!--

-    * 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>

+<!--
+    * 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>implementation-java-calculator/**/*</include>
+                <include>calculator/**/*</include>
+                <include>calculator-equinox/**/*</include>
+                <include>calculator-osgi/**/*</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>