Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Hugues Malphettes 2011-05-30 10:31:51 +00:00
parent 831e84d114
commit c1086a2e52
2 changed files with 3 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
jetty-osgi/jetty-osgi-boot/pom.xml
View File

@ -40,62 +40,6 @@
</dependency> </dependency>
</dependencies> </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> <build>
<plugins> <plugins>
<plugin> <plugin>
@ -105,7 +49,7 @@
<phase>process-resources</phase> <phase>process-resources</phase>
<configuration> <configuration>
<tasks> <tasks>
<delete file="target/classes/META-INF/MANIFEST.MF" /> <!--delete file="target/classes/META-INF/MANIFEST.MF" /-->
<copy todir="target/classes/jettyhome"> <copy todir="target/classes/jettyhome">
<fileset dir="jettyhome"> <fileset dir="jettyhome">
<exclude name="**/*.log" /> <exclude name="**/*.log" />

4
jetty-osgi/jetty-osgi-boot/src/main/java/org/eclipse/jetty/osgi/boot/OSGiAppProvider.java
View File

@ -380,11 +380,11 @@ public class OSGiAppProvider extends ScanningAppProvider implements AppProvider
/** /**
* @return true when this app provider locates osgi bundles and features in * @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() public boolean isAutoInstallOSGiBundles()
{ {
return _autoInstallOSGiBundles; return getMonitoredDirResource() != null && _autoInstallOSGiBundles;
} }
/** /**