#331974 Moved Messages class to pde.internal.publishing package
- Content was copied from the pde.build bundle, so the p2.publisher.eclipse package is the wrong location for this file
diff --git a/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java b/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
index 1944ddb..0114bd5 100644
--- a/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
+++ b/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/ProductFile.java
@@ -14,20 +14,40 @@
package org.eclipse.equinox.internal.p2.publisher.eclipse;
-import java.io.*;
-import java.util.*;
+import java.io.BufferedInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
import java.util.Map.Entry;
-import javax.xml.parsers.*;
-import org.eclipse.core.runtime.*;
+import java.util.Properties;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
import org.eclipse.equinox.frameworkadmin.BundleInfo;
-import org.eclipse.equinox.internal.p2.core.helpers.*;
+import org.eclipse.equinox.internal.p2.core.helpers.CollectionUtils;
+import org.eclipse.equinox.internal.p2.core.helpers.ServiceHelper;
+import org.eclipse.equinox.internal.p2.core.helpers.URLUtil;
import org.eclipse.equinox.p2.metadata.IVersionedId;
import org.eclipse.equinox.p2.metadata.VersionedId;
import org.eclipse.equinox.p2.publisher.eclipse.FeatureEntry;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.util.NLS;
import org.eclipse.pde.internal.publishing.Activator;
-import org.xml.sax.*;
+import org.eclipse.pde.internal.publishing.Messages;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
/**
diff --git a/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/Messages.java b/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/pde/internal/publishing/Messages.java
similarity index 93%
rename from p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/Messages.java
rename to p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/pde/internal/publishing/Messages.java
index 67491d7..5c56e5b 100644
--- a/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/Messages.java
+++ b/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/pde/internal/publishing/Messages.java
@@ -8,7 +8,7 @@
* Contributors:
* IBM - Initial API and implementation
*******************************************************************************/
-package org.eclipse.equinox.internal.p2.publisher.eclipse;
+package org.eclipse.pde.internal.publishing;
import org.eclipse.osgi.util.NLS;
diff --git a/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/messages.properties b/p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/pde/internal/publishing/messages.properties
similarity index 100%
rename from p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/equinox/internal/p2/publisher/eclipse/messages.properties
rename to p2/publishing/org.eclipse.pde.publishing/src/org/eclipse/pde/internal/publishing/messages.properties
