Author: hibou
Date: Fri Nov 19 14:12:17 2010
New Revision: 1036858
URL: http://svn.apache.org/viewvc?rev=1036858&view=rev
Log:
fix incorrect import of FileResource
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/ivy/OsgiManifestParser.java
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/ivy/OsgiManifestParser.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/ivy/OsgiManifestParser.java?rev=1036858&r1=1036857&r2=1036858&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/ivy/OsgiManifestParser.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/osgi/ivy/OsgiManifestParser.java
Fri Nov 19 14:12:17 2010
@@ -49,14 +49,11 @@ import org.apache.ivy.plugins.parser.Mod
import org.apache.ivy.plugins.parser.ParserSettings;
import org.apache.ivy.plugins.parser.xml.XmlModuleDescriptorWriter;
import org.apache.ivy.plugins.repository.Resource;
+import org.apache.ivy.plugins.repository.file.FileResource;
import org.apache.ivy.util.Message;
-import org.apache.tools.ant.types.resources.FileResource;
/**
* An parser for OSGi Manifest descriptor.
- *
- * @author [email protected]
- * @author [email protected]
*/
public class OsgiManifestParser extends AbstractModuleDescriptorParser {
@@ -122,7 +119,7 @@ public class OsgiManifestParser extends
public void parse(Resource res, boolean useExports) throws IOException
{
Manifest manifest;
- if ((res instanceof FileResource) && ((FileResource)
res).isDirectory()) {
+ if ((res instanceof FileResource) && ((FileResource)
res).getFile().isDirectory()) {
manifest = new Manifest(
new FileInputStream(res.getName() +
"/META-INF/MANIFEST.MF"));
} else if (res.getName().toUpperCase().endsWith(".JAR")) {
