From c1086a2e525d8d4eee67662a5214735fce70991a Mon Sep 17 00:00:00 2001
From: Hugues Malphettes <hmalphettes@intalio.com>
Date: Mon, 30 May 2011 10:31:51 +0000
Subject: [PATCH] bug 347617 fix the trivial mistake

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3351 7e9141cc-0065-0410-87d8-b60c137991c4
---
 jetty-osgi/jetty-osgi-boot/pom.xml            | 58 +------------------
 .../jetty/osgi/boot/OSGiAppProvider.java      |  4 +-
 2 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 9ac43c6d4f4..f7cbab77b45 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -40,62 +40,6 @@
     </dependency>
   </dependencies>
 
-  <!--build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>process-resources</phase>
-            <configuration>
-              <tasks>
-                <replace file="target/classes/META-INF/MANIFEST.MF" token="Bundle-Version: 7.3.0.qualifier" value="Bundle-Version: ${parsedVersion.osgiVersion}" />
-                <copy todir="target/classes/jettyhome">
-                    <fileset dir="jettyhome">
-                        <exclude name="**/*.log" />
-                    </fileset>
-                </copy>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>artifact-jar</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-jar</id>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <archive>
-            <manifestFile>target/classes/META-INF/MANIFEST.MF</manifestFile>
-          </archive>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <configuration>
-          <onlyAnalyze>org.eclipse.jetty.osgi.boot.*</onlyAnalyze>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build-->
-  
       <build> 
         <plugins> 
             <plugin> 
@@ -105,7 +49,7 @@
                         <phase>process-resources</phase> 
                         <configuration> 
                             <tasks>
-                                <delete file="target/classes/META-INF/MANIFEST.MF" />
+                                <!--delete file="target/classes/META-INF/MANIFEST.MF" /-->
                                 <copy todir="target/classes/jettyhome"> 
                                     <fileset dir="jettyhome"> 
                                         <exclude name="**/*.log" /> 
diff --git a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
index 5bebe2e8524..e721589fa83 100644
--- a/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
+++ b/jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
@@ -380,11 +380,11 @@ public class OSGiAppProvider extends ScanningAppProvider implements AppProvider
 
     /**
      * @return true when this app provider locates osgi bundles and features in
-     * its monitored directory and installs them. false by default.
+     * its monitored directory and installs them. By default true if there is a folder to monitor.
      */
     public boolean isAutoInstallOSGiBundles()
     {
-        return _autoInstallOSGiBundles;
+        return getMonitoredDirResource() != null && _autoInstallOSGiBundles;
     }
 
     /**