tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r689338 - in /tuscany/java/sca/distribution/features: core/src/main/components/ ejava/src/main/assembly/ etc/ manager/src/main/assembly/ process/src/main/assembly/ web20/src/main/assembly/ webservice/src/main/assembly/
Date Wed, 27 Aug 2008 02:37:03 GMT
Author: jsdelfino
Date: Tue Aug 26 19:37:02 2008
New Revision: 689338

URL: http://svn.apache.org/viewvc?rev=689338&view=rev
Log:
Minor fixes. Renamed down-dependencies to filtered-dependencies. Removed the useTransitiveDependencies
element as it causes dependencies to be incorrectly excluded.

Added:
    tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
      - copied, changed from r688770, tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml
    tuscany/java/sca/distribution/features/etc/generate-filtered-dependencies.sh
      - copied, changed from r688770, tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh
Removed:
    tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml
    tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh
Modified:
    tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml
    tuscany/java/sca/distribution/features/etc/generate-all-maven-files.sh
    tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml
    tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml
    tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml
    tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml

Copied: tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
(from r688770, tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml?p2=tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml&p1=tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml&r1=688770&r2=689338&rev=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/core/src/main/components/bin-down-dependencies.xml
(original)
+++ tuscany/java/sca/distribution/features/core/src/main/components/bin-filtered-dependencies.xml
Tue Aug 26 19:37:02 2008
@@ -23,7 +23,6 @@
         <dependencySet>
             <outputDirectory>modules</outputDirectory>
             <unpack>false</unpack>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
             <includes>
                 <include>org.apache.tuscany.sca:*</include>
             </includes>
@@ -80,7 +79,6 @@
         <dependencySet>
             <outputDirectory>lib</outputDirectory>
             <unpack>false</unpack>
-            <useTransitiveFiltering>true</useTransitiveFiltering>
             <excludes>
                 <exclude>asm:asm-all</exclude>
                 <exclude>cglib:cglib-nodep</exclude>

Modified: tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml?rev=689338&r1=689337&r2=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/ejava/src/main/assembly/bin.xml Tue Aug 26 19:37:02
2008
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>

Modified: tuscany/java/sca/distribution/features/etc/generate-all-maven-files.sh
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/etc/generate-all-maven-files.sh?rev=689338&r1=689337&r2=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/etc/generate-all-maven-files.sh (original)
+++ tuscany/java/sca/distribution/features/etc/generate-all-maven-files.sh Tue Aug 26 19:37:02
2008
@@ -19,7 +19,7 @@
 # for all the distributions
 
 echo "Generate Maven files: core"
-cd core; ../etc/generate-down-dependencies.sh > src/main/components/bin-down-dependencies.xml;
../etc/generate-maven-files.sh
+cd core; ../etc/generate-filtered-dependencies.sh > src/main/components/bin-filtered-dependencies.xml;
../etc/generate-maven-files.sh
 
 echo "Generate Maven files: ejava"
 cd ../ejava; ../etc/generate-maven-files.sh

Copied: tuscany/java/sca/distribution/features/etc/generate-filtered-dependencies.sh (from
r688770, tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh)
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/etc/generate-filtered-dependencies.sh?p2=tuscany/java/sca/distribution/features/etc/generate-filtered-dependencies.sh&p1=tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh&r1=688770&r2=689338&rev=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/etc/generate-down-dependencies.sh (original)
+++ tuscany/java/sca/distribution/features/etc/generate-filtered-dependencies.sh Tue Aug 26
19:37:02 2008
@@ -43,7 +43,6 @@
 echo "        <dependencySet>"
 echo "            <outputDirectory>modules</outputDirectory>"
 echo "            <unpack>false</unpack>"
-echo "            <useTransitiveFiltering>true</useTransitiveFiltering>"
 echo "            <includes>"
 echo "                <include>org.apache.tuscany.sca:*</include>"
 echo "            </includes>"
@@ -58,7 +57,6 @@
 echo "        <dependencySet>"
 echo "            <outputDirectory>lib</outputDirectory>"
 echo "            <unpack>false</unpack>"
-echo "            <useTransitiveFiltering>true</useTransitiveFiltering>"
 echo "            <excludes>"
 
 mvn -o dependency:list | awk '/.INFO.    (.*):(.*):(.*):(.*):(.*)/ && !/(.*)(.tuscany.sca):(.*)/
{ print gensub("(.INFO.    )(.*)(:)(.*)(:)(.*)(:)(.*)(:)(.*)", "\\2:\\4", "g") }' | sort |
awk '{ printf "                <exclude>%s</exclude>\n", $1 }'

Modified: tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml?rev=689338&r1=689337&r2=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/manager/src/main/assembly/bin.xml Tue Aug 26 19:37:02
2008
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>

Modified: tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml?rev=689338&r1=689337&r2=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/process/src/main/assembly/bin.xml Tue Aug 26 19:37:02
2008
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>

Modified: tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml?rev=689338&r1=689337&r2=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/web20/src/main/assembly/bin.xml Tue Aug 26 19:37:02
2008
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>

Modified: tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml?rev=689338&r1=689337&r2=689338&view=diff
==============================================================================
--- tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml (original)
+++ tuscany/java/sca/distribution/features/webservice/src/main/assembly/bin.xml Tue Aug 26
19:37:02 2008
@@ -32,7 +32,7 @@
 
     <componentDescriptors>
         <componentDescriptor>../core/src/main/components/bin-common.xml</componentDescriptor>
-        <componentDescriptor>../core/src/main/components/bin-down-dependencies.xml</componentDescriptor>
+        <componentDescriptor>../core/src/main/components/bin-filtered-dependencies.xml</componentDescriptor>
         <componentDescriptor>src/main/components/bin-samples.xml</componentDescriptor>
     </componentDescriptors>
 </assembly>



Mime
View raw message