You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2007/06/19 05:26:34 UTC

svn commit: r548568 - in /incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl: FolderContributionProcessor.java JarContributionProcessor.java

Author: jsdelfino
Date: Mon Jun 18 20:26:34 2007
New Revision: 548568

URL: http://svn.apache.org/viewvc?view=rev&rev=548568
Log:
Register artifacts for directories as well as files.

Modified:
    incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
    incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java?view=diff&rev=548568&r1=548567&r2=548568
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/FolderContributionProcessor.java Mon Jun 18 20:26:34 2007
@@ -62,9 +62,13 @@
     private void traverse(List<URI> fileList, File file, File root) throws IOException {
         if (file.isFile()) {
             fileList.add(root.toURI().relativize(file.toURI()));
+            
         } else if (file.isDirectory()) {
             // FIXME: Maybe we should externalize it as a property
             // Regular expression to exclude .xxx files
+            
+            fileList.add(root.toURI().relativize(file.toURI()));
+            
             File[] files = file.listFiles(FileHelper.getFileFilter("[^\u002e].*", true));
             for (int i = 0; i < files.length; i++) {
                 traverse(fileList, files[i], root);

Modified: incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java?view=diff&rev=548568&r1=548567&r2=548568
==============================================================================
--- incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/contribution-impl/src/main/java/org/apache/tuscany/sca/contribution/processor/impl/JarContributionProcessor.java Mon Jun 18 20:26:34 2007
@@ -80,9 +80,6 @@
                     // EOF
                     break;
                 }
-                if (entry.isDirectory()) {
-                    continue;
-                }
 
                 // FIXME: Maybe we should externalize the filter as a property
                 if (!entry.getName().startsWith(".")) {



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org