From 001f5d05380840d811c85547c361ae0fde5a35a1 Mon Sep 17 00:00:00 2001
From: antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 18 Apr 2009 08:06:18 +0000
Subject: Bump up 1.x trunk version to 1.6-SNAPSHOT

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@766265 13f79535-47bb-0310-9956-ffa450edef68
---
 .../sca-java-1.x/distribution/features/all/pom.xml | 478 ++++++++++-----------
 .../features/all/src/main/assembly/bin.xml         |  86 ++--
 .../features/all/src/main/assembly/src.xml         |  84 ++--
 3 files changed, 324 insertions(+), 324 deletions(-)

(limited to 'branches/sca-java-1.x/distribution/features/all')

diff --git a/branches/sca-java-1.x/distribution/features/all/pom.xml b/branches/sca-java-1.x/distribution/features/all/pom.xml
index 788ab4d679..beb5b0c205 100644
--- a/branches/sca-java-1.x/distribution/features/all/pom.xml
+++ b/branches/sca-java-1.x/distribution/features/all/pom.xml
@@ -1,239 +1,239 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * 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.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-distribution-features</artifactId>
-        <version>1.5-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>tuscany-distribution-all</artifactId>
-    <name>Apache Tuscany SCA All-in-one Distribution</name>
-    <packaging>pom</packaging>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-core</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-ejava</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-manager</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-process</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-web20</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-distribution-webservice</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-ant-generator</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-java2wsdl</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-wsdl2java</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-maven-incremental-build</artifactId>
-            <type>pom</type>
-            <version>1.5-SNAPSHOT</version>
-        </dependency>
-
-    </dependencies>
-
-    <profiles>
-    
-        <!-- Default build profile that can be used to build the distro packages -->
-        <profile>
-            <id>default</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>distribution-package</id>
-                                <phase>package</phase>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <configuration>
-                                    <descriptors>
-                                        <descriptor>src/main/assembly/bin.xml</descriptor>
-                                        <descriptor>src/main/assembly/src.xml</descriptor>
-                                    </descriptors>
-                                    <tarLongFileMode>gnu</tarLongFileMode>
-                                    <finalName>apache-tuscany-sca-all-1.5-SNAPSHOT</finalName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>    
-
-        <!-- Profile that can be used to build the modules included in the distro -->
-        <profile>
-            <id>modules</id>
-            <modules>
-                <module>../../../modules/assembly</module>
-                <module>../../../modules/assembly-xml</module>
-                <module>../../../modules/assembly-xsd</module>
-                <module>../../../modules/binding-atom</module>
-                <module>../../../modules/binding-atom-abdera</module>
-                <module>../../../modules/binding-corba</module>
-                <module>../../../modules/binding-corba-runtime</module>
-                <module>../../../modules/binding-ejb</module>
-                <module>../../../modules/binding-ejb-runtime</module>
-                <module>../../../modules/binding-http</module>
-                <module>../../../modules/binding-http-runtime</module>
-                <module>../../../modules/binding-jms</module>
-                <module>../../../modules/binding-jms-runtime</module>
-                <module>../../../modules/binding-jsonrpc</module>
-                <module>../../../modules/binding-jsonrpc-runtime</module>
-                <module>../../../modules/binding-rss</module>
-                <module>../../../modules/binding-rss-rome</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>
-                <module>../../../modules/contribution-namespace</module>
-                <module>../../../modules/contribution-resource</module>
-                <module>../../../modules/contribution-xml</module>
-                <module>../../../modules/core</module>
-                <module>../../../modules/core-databinding</module>
-                <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-json</module>
-                <module>../../../modules/databinding-saxon</module>
-                <module>../../../modules/databinding-sdo</module>
-                <module>../../../modules/databinding-sdo-axiom</module>
-                <module>../../../modules/definitions</module>
-                <module>../../../modules/definitions-xml</module>
-                <module>../../../modules/domain-manager</module>
-                <module>../../../modules/endpoint</module>
-                <module>../../../modules/extensibility</module>
-                <module>../../../modules/extensibility-equinox</module>
-                <module>../../../modules/extension-helper</module>
-                <module>../../../modules/host-corba</module>
-                <module>../../../modules/host-corba-jse</module>
-                <module>../../../modules/host-ejb</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-ejb</module>
-                <module>../../../modules/implementation-java</module>
-                <module>../../../modules/implementation-java-runtime</module>
-                <module>../../../modules/implementation-java-xml</module>
-                <module>../../../modules/implementation-node</module>
-                <module>../../../modules/implementation-node-runtime</module>
-                <module>../../../modules/implementation-resource</module>
-                <module>../../../modules/implementation-resource-runtime</module>
-                <module>../../../modules/implementation-script</module>
-                <module>../../../modules/implementation-spring</module>
-                <module>../../../modules/implementation-widget</module>
-                <module>../../../modules/implementation-widget-runtime</module>
-                <module>../../../modules/implementation-xquery</module>
-                <module>../../../modules/interface</module>
-                <module>../../../modules/interface-java</module>
-                <module>../../../modules/interface-java-jaxws</module>
-                <module>../../../modules/interface-java-xml</module>
-                <module>../../../modules/interface-wsdl</module>
-                <module>../../../modules/interface-wsdl-xml</module>
-                <module>../../../modules/monitor</module>
-                <module>../../../modules/node-api</module>
-                <module>../../../modules/node-impl</module>
-                <module>../../../modules/node-launcher</module>
-                <module>../../../modules/node-launcher-equinox</module>
-                <module>../../../modules/node-launcher-webapp</module>
-                <module>../../../modules/node-manager</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/workspace</module>
-                <module>../../../modules/workspace-impl</module>
-                <module>../../../modules/workspace-xml</module>
-                <module>../../../modules/xsd</module>
-                <module>../../../modules/xsd-xml</module>
-            </modules>
-        </profile>
-    </profiles>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * 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.    
+-->
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.apache.tuscany.sca</groupId>
+        <artifactId>tuscany-distribution-features</artifactId>
+        <version>1.6-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>tuscany-distribution-all</artifactId>
+    <name>Apache Tuscany SCA All-in-one Distribution</name>
+    <packaging>pom</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-core</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-ejava</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-manager</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-process</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-web20</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-distribution-webservice</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-ant-generator</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-java2wsdl</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-wsdl2java</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.tuscany.sca</groupId>
+            <artifactId>tuscany-maven-incremental-build</artifactId>
+            <type>pom</type>
+            <version>1.6-SNAPSHOT</version>
+        </dependency>
+
+    </dependencies>
+
+    <profiles>
+    
+        <!-- Default build profile that can be used to build the distro packages -->
+        <profile>
+            <id>default</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-assembly-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>distribution-package</id>
+                                <phase>package</phase>
+                                <goals>
+                                    <goal>single</goal>
+                                </goals>
+                                <configuration>
+                                    <descriptors>
+                                        <descriptor>src/main/assembly/bin.xml</descriptor>
+                                        <descriptor>src/main/assembly/src.xml</descriptor>
+                                    </descriptors>
+                                    <tarLongFileMode>gnu</tarLongFileMode>
+                                    <finalName>apache-tuscany-sca-all-1.6-SNAPSHOT</finalName>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>    
+
+        <!-- Profile that can be used to build the modules included in the distro -->
+        <profile>
+            <id>modules</id>
+            <modules>
+                <module>../../../modules/assembly</module>
+                <module>../../../modules/assembly-xml</module>
+                <module>../../../modules/assembly-xsd</module>
+                <module>../../../modules/binding-atom</module>
+                <module>../../../modules/binding-atom-abdera</module>
+                <module>../../../modules/binding-corba</module>
+                <module>../../../modules/binding-corba-runtime</module>
+                <module>../../../modules/binding-ejb</module>
+                <module>../../../modules/binding-ejb-runtime</module>
+                <module>../../../modules/binding-http</module>
+                <module>../../../modules/binding-http-runtime</module>
+                <module>../../../modules/binding-jms</module>
+                <module>../../../modules/binding-jms-runtime</module>
+                <module>../../../modules/binding-jsonrpc</module>
+                <module>../../../modules/binding-jsonrpc-runtime</module>
+                <module>../../../modules/binding-rss</module>
+                <module>../../../modules/binding-rss-rome</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>
+                <module>../../../modules/contribution-namespace</module>
+                <module>../../../modules/contribution-resource</module>
+                <module>../../../modules/contribution-xml</module>
+                <module>../../../modules/core</module>
+                <module>../../../modules/core-databinding</module>
+                <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-json</module>
+                <module>../../../modules/databinding-saxon</module>
+                <module>../../../modules/databinding-sdo</module>
+                <module>../../../modules/databinding-sdo-axiom</module>
+                <module>../../../modules/definitions</module>
+                <module>../../../modules/definitions-xml</module>
+                <module>../../../modules/domain-manager</module>
+                <module>../../../modules/endpoint</module>
+                <module>../../../modules/extensibility</module>
+                <module>../../../modules/extensibility-equinox</module>
+                <module>../../../modules/extension-helper</module>
+                <module>../../../modules/host-corba</module>
+                <module>../../../modules/host-corba-jse</module>
+                <module>../../../modules/host-ejb</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-ejb</module>
+                <module>../../../modules/implementation-java</module>
+                <module>../../../modules/implementation-java-runtime</module>
+                <module>../../../modules/implementation-java-xml</module>
+                <module>../../../modules/implementation-node</module>
+                <module>../../../modules/implementation-node-runtime</module>
+                <module>../../../modules/implementation-resource</module>
+                <module>../../../modules/implementation-resource-runtime</module>
+                <module>../../../modules/implementation-script</module>
+                <module>../../../modules/implementation-spring</module>
+                <module>../../../modules/implementation-widget</module>
+                <module>../../../modules/implementation-widget-runtime</module>
+                <module>../../../modules/implementation-xquery</module>
+                <module>../../../modules/interface</module>
+                <module>../../../modules/interface-java</module>
+                <module>../../../modules/interface-java-jaxws</module>
+                <module>../../../modules/interface-java-xml</module>
+                <module>../../../modules/interface-wsdl</module>
+                <module>../../../modules/interface-wsdl-xml</module>
+                <module>../../../modules/monitor</module>
+                <module>../../../modules/node-api</module>
+                <module>../../../modules/node-impl</module>
+                <module>../../../modules/node-launcher</module>
+                <module>../../../modules/node-launcher-equinox</module>
+                <module>../../../modules/node-launcher-webapp</module>
+                <module>../../../modules/node-manager</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/workspace</module>
+                <module>../../../modules/workspace-impl</module>
+                <module>../../../modules/workspace-xml</module>
+                <module>../../../modules/xsd</module>
+                <module>../../../modules/xsd-xml</module>
+            </modules>
+        </profile>
+    </profiles>
+
+</project>
diff --git a/branches/sca-java-1.x/distribution/features/all/src/main/assembly/bin.xml b/branches/sca-java-1.x/distribution/features/all/src/main/assembly/bin.xml
index 872edf36f3..b0db7835e7 100644
--- a/branches/sca-java-1.x/distribution/features/all/src/main/assembly/bin.xml
+++ b/branches/sca-java-1.x/distribution/features/all/src/main/assembly/bin.xml
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id></id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-1.5-SNAPSHOT</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-dependencies.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
-        <componentDescriptor>../ejava/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>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.
+-->
+<assembly>
+    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+    <id></id>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>tuscany-sca-1.6-SNAPSHOT</baseDirectory>
+    <formats>
+        <!--
+        <format>dir</format>
+        <format>tar.gz</format>
+        -->
+        <format>zip</format>
+    </formats>
+
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-samples.xml</componentDescriptor>
+        <componentDescriptor>../ejava/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>../webservice/src/main/components/bin-samples.xml</componentDescriptor>
+    </componentDescriptors>
+</assembly>
diff --git a/branches/sca-java-1.x/distribution/features/all/src/main/assembly/src.xml b/branches/sca-java-1.x/distribution/features/all/src/main/assembly/src.xml
index 7189c59451..d6ede9777d 100644
--- a/branches/sca-java-1.x/distribution/features/all/src/main/assembly/src.xml
+++ b/branches/sca-java-1.x/distribution/features/all/src/main/assembly/src.xml
@@ -1,42 +1,42 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    * 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.
--->
-<assembly>
-    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
-    <id>src</id>
-    <includeBaseDirectory>true</includeBaseDirectory>
-    <baseDirectory>tuscany-sca-1.5-SNAPSHOT-src</baseDirectory>
-    <formats>
-        <!--
-        <format>dir</format>
-        <format>tar.gz</format>
-        -->
-        <format>zip</format>
-    </formats>
-
-    <componentDescriptors>
-        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor>
-        <componentDescriptor>../ejava/src/main/components/src-modules.xml</componentDescriptor>
-        <componentDescriptor>../manager/src/main/components/src-modules.xml</componentDescriptor>
-        <componentDescriptor>../process/src/main/components/src-modules.xml</componentDescriptor>
-        <componentDescriptor>../web20/src/main/components/src-modules.xml</componentDescriptor>
-        <componentDescriptor>../webservice/src/main/components/src-modules.xml</componentDescriptor>
-    </componentDescriptors>
-</assembly>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    * 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.
+-->
+<assembly>
+    <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+    <id>src</id>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <baseDirectory>tuscany-sca-1.6-SNAPSHOT-src</baseDirectory>
+    <formats>
+        <!--
+        <format>dir</format>
+        <format>tar.gz</format>
+        -->
+        <format>zip</format>
+    </formats>
+
+    <componentDescriptors>
+        <componentDescriptor>../core/src/main/components/src-common.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/src-modules.xml</componentDescriptor>
+        <componentDescriptor>../ejava/src/main/components/src-modules.xml</componentDescriptor>
+        <componentDescriptor>../manager/src/main/components/src-modules.xml</componentDescriptor>
+        <componentDescriptor>../process/src/main/components/src-modules.xml</componentDescriptor>
+        <componentDescriptor>../web20/src/main/components/src-modules.xml</componentDescriptor>
+        <componentDescriptor>../webservice/src/main/components/src-modules.xml</componentDescriptor>
+    </componentDescriptors>
+</assembly>
-- 
cgit v1.2.3