Improve error messages
diff --git a/org.eclipse.pde.build/build.properties b/org.eclipse.pde.build/build.properties
index 1a04fb6..600f324 100644
--- a/org.eclipse.pde.build/build.properties
+++ b/org.eclipse.pde.build/build.properties
@@ -1,6 +1,17 @@
-source.pdebuild.jar=src/
-source.lib/pdebuild-ant.jar=src_ant/
-jars.compile.order=pdebuild.jar,lib/pdebuild-ant.jar
-extra.lib/pdebuild-ant.jar=../org.apache.ant/ant.jar
-bin.includes=plugin.xml,plugin.properties,about.html,*.jar,lib/*.jar,scripts/, templates/, feature/, notes/, META-INF/
-src.includes=about.html
\ No newline at end of file
+extra.lib/pdebuild-ant.jar = ../org.apache.ant/ant.jar
+bin.includes = plugin.xml,\
+ plugin.properties,\
+ about.html,\
+ *.jar,\
+ lib/*.jar,\
+ scripts/,\
+ templates/,\
+ feature/,\
+ notes/,\
+ META-INF/,\
+ .options
+jars.compile.order = pdebuild.jar,\
+ lib/pdebuild-ant.jar
+source.pdebuild.jar = src/
+src.includes = about.html
+source.lib/pdebuild-ant.jar = src_ant/
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
index e96f61c..f97ddc9 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AbstractScriptGenerator.java
@@ -103,7 +103,7 @@
return model.getLocation();
}
- public static Properties readProperties(String location, String fileName) throws CoreException {
+ public static Properties readProperties(String location, String fileName, int errorLevel) throws CoreException {
Properties result = new Properties();
File file = new File(location, fileName);
try {
@@ -115,7 +115,7 @@
}
} catch (FileNotFoundException e) {
String message = Policy.bind("exception.missingFile", file.toString()); //$NON-NLS-1$
- BundleHelper.getDefault().getLog().log(new Status(IStatus.WARNING, PI_PDEBUILD, EXCEPTION_READING_FILE, message, null));
+ BundleHelper.getDefault().getLog().log(new Status(errorLevel, PI_PDEBUILD, EXCEPTION_READING_FILE, message, null));
} catch (IOException e) {
String message = Policy.bind("exception.readingFile", file.toString()); //$NON-NLS-1$
throw new CoreException(new Status(IStatus.ERROR, PI_PDEBUILD, EXCEPTION_READING_FILE, message, e));
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java
index 27e3cca..68d643d 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/AssembleConfigScriptGenerator.java
@@ -78,8 +78,8 @@
}
private void loadPostProcessingSteps() throws CoreException {
try {
- pluginsPostProcessingSteps = readProperties(AbstractScriptGenerator.getWorkingDirectory(), DEFAULT_PLUGINS_POSTPROCESSINGSTEPS_FILENAME_DESCRIPTOR);
- featuresPostProcessingSteps = readProperties(AbstractScriptGenerator.getWorkingDirectory(), DEFAULT_FEATURES_POSTPROCESSINGSTEPS_FILENAME_DESCRIPTOR);
+ pluginsPostProcessingSteps = readProperties(AbstractScriptGenerator.getWorkingDirectory(), DEFAULT_PLUGINS_POSTPROCESSINGSTEPS_FILENAME_DESCRIPTOR, IStatus.INFO);
+ featuresPostProcessingSteps = readProperties(AbstractScriptGenerator.getWorkingDirectory(), DEFAULT_FEATURES_POSTPROCESSINGSTEPS_FILENAME_DESCRIPTOR, IStatus.INFO);
} catch(CoreException e) {
//Ignore
}
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java
index ecd6c07..f9a89ad 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/FetchScriptGenerator.java
@@ -475,7 +475,7 @@
*/
protected String getCVSInfo(String elementName) throws CoreException {
if (directory == null)
- directory = readProperties(directoryLocation, ""); //$NON-NLS-1$
+ directory = readProperties(directoryLocation, "", IStatus.ERROR); //$NON-NLS-1$
return directory.getProperty(elementName);
}
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java
index 42f7d49..6273700 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/FeatureBuildScriptGenerator.java
@@ -784,7 +784,7 @@
*/
protected Properties getBuildProperties() throws CoreException {
if (buildProperties == null)
- buildProperties = readProperties(featureRootLocation, PROPERTIES_FILE);
+ buildProperties = readProperties(featureRootLocation, PROPERTIES_FILE, IStatus.WARNING);
return buildProperties;
}
/**
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
index e5cba67..89b40c6 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/builder/ModelBuildScriptGenerator.java
@@ -424,7 +424,7 @@
protected Properties getPermissionProperties() throws CoreException {
if (permissionProperties == null) {
- permissionProperties = readProperties(getLocation(model), PERMISSIONS_FILE);
+ permissionProperties = readProperties(getLocation(model), PERMISSIONS_FILE, IStatus.INFO);
}
return permissionProperties;
}
@@ -823,7 +823,7 @@
protected Properties getBuildProperties() throws CoreException {
if (buildProperties == null)
- return buildProperties = readProperties(model.getLocation(), propertiesFileName);
+ return buildProperties = readProperties(model.getLocation(), propertiesFileName, IStatus.WARNING);
return buildProperties;
}
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java
index 80e1cdf..9f8342d 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/FetchFileGenerator.java
@@ -103,7 +103,7 @@
final int DIRECTORY = 2;
final int FILTERS = 3;
- mapContent = readProperties(mapLocation, ""); //$NON-NLS-1$
+ mapContent = readProperties(mapLocation, "", IStatus.ERROR); //$NON-NLS-1$
for (Iterator iter = mapContent.entrySet().iterator(); iter.hasNext();) {
Map.Entry mapEntry = (Map.Entry) iter.next();
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java
index d963a5e..e27dc91 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/packager/UnzipperGenerator.java
@@ -13,6 +13,7 @@
import java.io.*;
import java.util.*;
import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
import org.eclipse.pde.internal.build.*;
public class UnzipperGenerator extends AbstractScriptGenerator {
@@ -81,7 +82,7 @@
}
private void generateUncompressionCommands() throws CoreException {
- zipsList = readProperties(workingDirectory, directoryLocation); //$NON-NLS-1$
+ zipsList = readProperties(workingDirectory, directoryLocation, IStatus.ERROR); //$NON-NLS-1$
List toUnzipWithOrder = new ArrayList(unzipOrder.length);
String zipEntries = zipsList.getProperty(Config.genericConfig().toString(","), ""); //$NON-NLS-1$ //$NON-NLS-2$
diff --git a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
index 2610f3f..6714003 100644
--- a/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
+++ b/org.eclipse.pde.build/src/org/eclipse/pde/internal/build/site/PDEState.java
@@ -188,7 +188,7 @@
if (versionInfo != null) {
if(versionInfo[0].getValue().endsWith(PROPERTY_QUALIFIER)) {
try {
- String qualifierInfo = AbstractScriptGenerator.readProperties(bundleLocation.getAbsolutePath(), IPDEBuildConstants.PROPERTIES_FILE).getProperty(PROPERTY_QUALIFIER);
+ String qualifierInfo = AbstractScriptGenerator.readProperties(bundleLocation.getAbsolutePath(), IPDEBuildConstants.PROPERTIES_FILE, IStatus.INFO).getProperty(PROPERTY_QUALIFIER);
manifest.put(PROPERTY_QUALIFIER, qualifierInfo);
} catch (CoreException e1) {
//Ignore
