Index: PortletLocalServiceImpl.java
===================================================================
--- PortletLocalServiceImpl.java	(revision 2544)
+++ PortletLocalServiceImpl.java	(working copy)
@@ -513,8 +513,11 @@
 			Element portlet = (Element)itr1.next();
 
 			String portletId = portlet.elementText("portlet-name");
-
+			
+			String originalPortletId = null;
+			
 			if (servletContextName != null) {
+				originalPortletId = portletId;
 				portletId =
 					portletId + Portlet.WAR_SEPARATOR + servletContextName;
 			}
@@ -532,11 +535,12 @@
 			if (portletModel == null) {
 				portletModel = new Portlet(
 					new PortletPK(portletId, _SHARED_KEY));
-
+				
 				portletsPool.put(portletId, portletModel);
 			}
 
 			if (servletContextName != null) {
+				portletModel.setOriginalPortletId(originalPortletId);
 				portletModel.setWARFile(true);
 			}
 
@@ -709,7 +713,7 @@
 
 			while (itr2.hasNext()) {
 				Element portlet = (Element)itr2.next();
-
+ 
 				String portletId = portlet.attributeValue("id");
 
 				if (servletContextName != null) {