Fix the the location of modules

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

2 files changed, 91 insertions, 91 deletions

diff --git a/java/sca/distribution/etc/generate-pom.sh b/java/sca/distribution/etc/generate-pom.sh
index ce0228694c..b14d96f4a0 100755
--- a/java/sca/distribution/etc/generate-pom.sh
+++ b/java/sca/distribution/etc/generate-pom.sh
@@ -1,26 +1,26 @@
-# 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. 
-
-# This script can be used to generate a Maven build profile that includes all
-# the modules included directly or transitively in a distribution
-
-cat pom.xml | awk 'BEGIN { i=0 } /<modules>/ { i=1; print } /.*/ { if (i==0) print } '
-
-mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | grep -v "distribution-" | grep -v "maven-" | grep -v "wsdl2java" | grep -v "java2wsdl" | sort | awk '{ printf "                <module>../../../modules/%s</module>\n", $1 }'
-
-cat pom.xml | awk 'BEGIN { i=0 } /<\/modules>/ { i=1 } /.*/ { if (i==1) print } '
-
+# 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. 

+

+# This script can be used to generate a Maven build profile that includes all

+# the modules included directly or transitively in a distribution

+

+cat pom.xml | awk 'BEGIN { i=0 } /<modules>/ { i=1; print } /.*/ { if (i==0) print } '

+

+mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | grep -v "distribution-" | grep -v "maven-" | grep -v "wsdl2java" | grep -v "java2wsdl" | sort | awk '{ printf "                <module>../../modules/%s</module>\n", $1 }'

+

+cat pom.xml | awk 'BEGIN { i=0 } /<\/modules>/ { i=1 } /.*/ { if (i==1) print } '

+

diff --git a/java/sca/distribution/etc/generate-src-modules.sh b/java/sca/distribution/etc/generate-src-modules.sh
index 60dbbcd2d0..7c44f74a0e 100755
--- a/java/sca/distribution/etc/generate-src-modules.sh
+++ b/java/sca/distribution/etc/generate-src-modules.sh
@@ -1,65 +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. 
-
-# This generates a Maven assembly component that can be included in a Maven
-# assembly to include the source of the modules in a source distribution.
-
-echo "<!--"
-echo "    * Licensed to the Apache Software Foundation (ASF) under one"
-echo "    * or more contributor license agreements.  See the NOTICE file"
-echo "    * distributed with this work for additional information"
-echo "    * regarding copyright ownership.  The ASF licenses this file"
-echo "    * to you under the Apache License, Version 2.0 (the"
-echo "    * "License"); you may not use this file except in compliance"
-echo "    * with the License.  You may obtain a copy of the License at"
-echo "    *"
-echo "    *   http://www.apache.org/licenses/LICENSE-2.0"
-echo "    *"
-echo "    * Unless required by applicable law or agreed to in writing,"
-echo "    * software distributed under the License is distributed on an"
-echo "    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"
-echo "    * KIND, either express or implied.  See the License for the"
-echo "    * specific language governing permissions and limitations"
-echo "    * under the License."
-echo "-->"
-echo "<component>"
-echo "    <fileSets>"
-echo ""
-echo "        <!-- Add module sources to the modules directory -->"
-echo "        <fileSet>"
-echo "            <directory>../../../modules</directory>"
-echo "            <outputDirectory>modules</outputDirectory>"
-echo "            <includes>"
-
-mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf "                <include>%s/**/*</include>\n", $1 }'
-
-echo "            </includes>"
-echo "            <excludes>"
-echo "                <!-- General file/folders to exclude -->"
-echo "                <exclude>**/.*</exclude>"
-echo "                <exclude>**/.*/**</exclude>"
-echo "                <exclude>**/*.log</exclude>"
-echo ""
-echo "                <!-- Specific files/folders to exclude -->"
-echo "                <exclude>pom.xml</exclude>"
-echo "                <exclude>**/target</exclude>"
-echo "                <exclude>**/target/**/*</exclude>"
-echo "            </excludes>"
-echo "        </fileSet>"
-echo "    </fileSets>"
-echo "</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. 

+

+# This generates a Maven assembly component that can be included in a Maven

+# assembly to include the source of the modules in a source distribution.

+

+echo "<!--"

+echo "    * Licensed to the Apache Software Foundation (ASF) under one"

+echo "    * or more contributor license agreements.  See the NOTICE file"

+echo "    * distributed with this work for additional information"

+echo "    * regarding copyright ownership.  The ASF licenses this file"

+echo "    * to you under the Apache License, Version 2.0 (the"

+echo "    * "License"); you may not use this file except in compliance"

+echo "    * with the License.  You may obtain a copy of the License at"

+echo "    *"

+echo "    *   http://www.apache.org/licenses/LICENSE-2.0"

+echo "    *"

+echo "    * Unless required by applicable law or agreed to in writing,"

+echo "    * software distributed under the License is distributed on an"

+echo "    * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY"

+echo "    * KIND, either express or implied.  See the License for the"

+echo "    * specific language governing permissions and limitations"

+echo "    * under the License."

+echo "-->"

+echo "<component>"

+echo "    <fileSets>"

+echo ""

+echo "        <!-- Add module sources to the modules directory -->"

+echo "        <fileSet>"

+echo "            <directory>../../modules</directory>"

+echo "            <outputDirectory>modules</outputDirectory>"

+echo "            <includes>"

+

+mvn -o dependency:list | awk '/.INFO.    (.*.tuscany.sca):(tuscany-)(.*):(.*):(.*):(.*)/ { print gensub("(.INFO.    )(.*)(:)(tuscany-)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\5", "g") }' | sort | awk '{ printf "                <include>%s/**/*</include>\n", $1 }'

+

+echo "            </includes>"

+echo "            <excludes>"

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

+echo "                <exclude>**/.*</exclude>"

+echo "                <exclude>**/.*/**</exclude>"

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

+echo ""

+echo "                <!-- Specific files/folders to exclude -->"

+echo "                <exclude>pom.xml</exclude>"

+echo "                <exclude>**/target</exclude>"

+echo "                <exclude>**/target/**/*</exclude>"

+echo "            </excludes>"

+echo "        </fileSet>"

+echo "    </fileSets>"

+echo "</component>"

+