You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by rf...@apache.org on 2009/08/19 02:04:33 UTC
svn commit: r805632 -
/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
Author: rfeng
Date: Wed Aug 19 00:04:33 2009
New Revision: 805632
URL: http://svn.apache.org/viewvc?rev=805632&view=rev
Log:
Add a filter to exclude files in the development mode (a bundle as a PDE project)
Modified:
tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
Modified: tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java?rev=805632&r1=805631&r2=805632&view=diff
==============================================================================
--- tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java (original)
+++ tuscany/java/sca/modules/contribution-osgi/src/main/java/org/apache/tuscany/sca/contribution/osgi/impl/OSGiBundleContributionScanner.java Wed Aug 19 00:04:33 2009
@@ -134,13 +134,19 @@
}
try {
+ // Test if the bundle is an Eclipse project
+ boolean devMode = (bundle.getEntry("/.project") != null);
// FIXME: The entries can come from fragments. Do we need to have a way to differentiate the entries?
Enumeration<?> entries = bundle.findEntries("/", "*", true);
while (entries.hasMoreElements()) {
URL entry = (URL)entries.nextElement();
String entryName = entry.getPath();
- if (entryName.contains("/.svn/")) {
+ if (devMode && entryName.contains("/.svn/")
+ || entryName.startsWith("/.")
+ || entryName.startsWith("/target/")
+ || entryName.startsWith("/src/")) {
// Ignore .svn files
+ // Ignore .classpath, .project, src, and target
continue;
}
if (entryName.startsWith("/")) {