summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGalileo Perez2013-03-13 17:48:03 (EDT)
committer Roberto Sanchez2013-03-13 17:48:03 (EDT)
commit797562462ceff01710cfb4a30df026080d5724da (patch)
treefe454be28d21fb4a3f2843c9a5f31f1c951a97d9
parent7ab00fd490157b39d2a72e82a03e6b658a06c873 (diff)
downloadwebtools.common-797562462ceff01710cfb4a30df026080d5724da.zip
webtools.common-797562462ceff01710cfb4a30df026080d5724da.tar.gz
webtools.common-797562462ceff01710cfb4a30df026080d5724da.tar.bz2
[363221] Failure to create a WAR file with project containing virtual foldersv201303132200
Bump plugin version for WTP 3.5
-rw-r--r--plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
index 5ab633a..8855f0d 100644
--- a/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.modulecore/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-Vendor: %provider
Bundle-SymbolicName: org.eclipse.wst.common.modulecore; singleton:=true
-Bundle-Version: 1.2.201.qualifier
+Bundle-Version: 1.2.300.qualifier
Bundle-Activator: org.eclipse.wst.common.componentcore.internal.ModulecorePlugin
Bundle-Localization: plugin
Export-Package: org.eclipse.wst.common.componentcore,
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
index c55c023..fb9ea0f 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/flat/FlatFolder.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2005, 2006 IBM Corporation and others.
+ * Copyright (c) 2005, 2013 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -99,7 +99,7 @@ public class FlatFolder extends FlatResource implements IFlatFolder {
if (container != null) {
if (IContainer.class.equals(cl) || IFolder.class.equals(cl) || IResource.class.equals(cl))
return container;
- if( File.class.equals(cl))
+ if( File.class.equals(cl)&& container.getLocation()!= null)
return container.getLocation().toFile();
}
return null;