Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Sievers2012-12-17 05:20:03 -0500
committerTobias Oberlies2013-01-25 08:23:42 -0500
commitae3f93aef90e280a1711da4ac11342c011ba480d (patch)
treea491f66a2bbb94d1cee53e0bd02d3306eca7ca2e /bundles/org.eclipse.equinox.p2.publisher
parentc32f1112f9b3d28bd3208ddb11c54ef2010b5eac (diff)
downloadrt.equinox.p2-ae3f93aef90e280a1711da4ac11342c011ba480d.tar.gz
rt.equinox.p2-ae3f93aef90e280a1711da4ac11342c011ba480d.tar.xz
rt.equinox.p2-ae3f93aef90e280a1711da4ac11342c011ba480d.zip
331683 Publisher returns error status in case of invalid manifestv20130125-132342
- BundlesAction will now return a multi-status with severity error (and details in child message(s)) in case of invalid MANIFEST or IOException. - Static helper methods createBundleDescription(), loadManifest() and basicLoadManifest() now throw BundleException and IOException instead of ignoring them. - Added corresponding ...IgnoringExceptions() methods (and marked them as deprecated) which preserve old behaviour and allow to adapt users of these methods as they see fit. Bug 331683
Diffstat (limited to 'bundles/org.eclipse.equinox.p2.publisher')
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java2
-rw-r--r--bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties2
2 files changed, 4 insertions, 0 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
index 0b8f76634..a6623af38 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/Messages.java
@@ -19,6 +19,7 @@ public class Messages extends NLS {
public static String exception_stateAddition;
public static String exception_errorReadingManifest;
public static String exception_errorLoadingManifest;
+ public static String exception_errorPublishingBundle;
public static String exception_errorLoadingProductFile;
public static String exception_noPluginConverter;
public static String exception_noArtifactRepo;
@@ -31,6 +32,7 @@ public class Messages extends NLS {
public static String exception_sourcePath;
public static String exception_nonExistingJreLocationFile;
+ public static String message_bundlesPublisherMultistatus;
public static String message_generatingMetadata;
public static String message_generationCompleted;
public static String message_noSimpleconfigurator;
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
index 6d1f30db8..aa28ffe16 100644
--- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
+++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/internal/p2/publisher/messages.properties
@@ -13,6 +13,7 @@ exception_errorConverting = An error occurred while generating manifest for {0}.
exception_stateAddition = An error has occurred while adding the bundle {0}.
exception_errorReadingManifest = An error occurred while parsing the bundle manifest {0}: {1}.
exception_errorLoadingManifest = An error occurred while loading the manifest {0}.
+exception_errorPublishingBundle = An error occurred while publishing bundle {0}: {1}
exception_noBundlesOrLocations=No bundles or locations provided.
exception_noFeaturesOrLocations=No features or locations provided.
exception_noPluginConverter=Unable to acquire PluginConverter service during generation for: {0}.
@@ -23,6 +24,7 @@ exception_invalidSiteReferenceInFeature=Invalid site reference {0} in feature {1
exception_repoMustBeURL=Repository location ({0}) must be a URL.
exception_sourcePath=Source location ({0}) must be a valid file-system path.
exception_nonExistingJreLocationFile=Provided location to JRE \"{0}\" does not exist on the file system.
+message_bundlesPublisherMultistatus=Messages while publishing bundles
message_eeDuplicateVersionAttribute=Cannot specify both ''version:Version'' and ''version:List<Version>'' in one entry: {0}
message_eeIgnoringNamespace=Ignoring unknown capability namespace ''{0}''
message_eeInvalidVersionAttribute=Syntax error in version ''{0}''

Back to the top