LPS-65044

modules/core/portal-bootstrap/system.packages.extra.mf

@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Bnd-LastModified: 1460067617603
+Bnd-LastModified: 1460594125083
 Bundle-ManifestVersion: 2
 Bundle-Name: portal-bootstrap
 Bundle-SymbolicName: portal-bootstrap
 Bundle-Vendor: Liferay, Inc.
 Bundle-Version: 1.0.0
-Created-By: 1.8.0_60 (Oracle Corporation)
+Created-By: 1.8.0_77 (Oracle Corporation)
 Export-Package: com.liferay.ibm.icu;version="4.0.1",com.liferay.ibm.ic
  u.impl;version="4.0.1";uses:="com.liferay.ibm.icu.math,com.liferay.ib
  m.icu.text,com.liferay.ibm.icu.util",com.liferay.ibm.icu.impl.coll;ve
@@ -2568,7 +2568,7 @@ Export-Package: com.liferay.ibm.icu;version="4.0.1",com.liferay.ibm.ic
  kernel.util",com.liferay.portal.kernel.backgroundtask.display;version
  ="1.0.0";uses:="com.liferay.portal.kernel.backgroundtask,com.liferay.
  portal.kernel.json,com.liferay.portal.kernel.template",com.liferay.po
- rtal.kernel.bean;version="7.0.0";uses:="javax.portlet,javax.servlet.h
+ rtal.kernel.bean;version="7.1.0";uses:="javax.portlet,javax.servlet.h
  ttp",com.liferay.portal.kernel.cache;version="7.0.0";uses:="com.lifer
  ay.portal.kernel.nio.intraband.proxy.annotation,com.liferay.portal.ke
  rnel.spring.osgi",com.liferay.portal.kernel.cache.configurator;versio
@@ -3494,7 +3494,7 @@ Export-Package: com.liferay.ibm.icu;version="4.0.1",com.liferay.ibm.ic
  ortal.systemevent;version="1.0.2";uses:="com.liferay.portal.kernel.mo
  del,com.liferay.portal.kernel.systemevent,com.liferay.portal.spring.a
  op,org.aopalliance.intercept",com.liferay.portal.template;version="1.
- 2.0";uses:="com.liferay.portal.kernel.cache,com.liferay.portal.kernel
+ 2.1";uses:="com.liferay.portal.kernel.cache,com.liferay.portal.kernel
  .security.pacl,com.liferay.portal.kernel.spring.osgi,com.liferay.port
  al.kernel.template,javax.portlet,javax.servlet,javax.servlet.http",co
  m.liferay.portal.templateparser;uses:="com.liferay.portal.kernel.io.u

portal-impl/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: ${manifest.bundle.name}
 Bundle-SymbolicName: ${manifest.bundle.symbolic.name}
-Bundle-Version: 2.4.0
+Bundle-Version: 2.4.1
 Export-Package:\
 	com.liferay.portal.bean,\
 	com.liferay.portal.cache.thread.local,\

portal-impl/src/com/liferay/portal/template/ServiceLocator.java

@@ -14,29 +14,34 @@
 
 package com.liferay.portal.template;
 
+import aQute.bnd.annotation.ProviderType;
+
 import com.liferay.portal.bean.BeanLocatorImpl;
 import com.liferay.portal.kernel.bean.PortalBeanLocatorUtil;
 import com.liferay.portal.kernel.bean.PortletBeanLocatorUtil;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.registry.Registry;
+import com.liferay.registry.RegistryUtil;
 
 /**
  * @author Brian Wing Shun Chan
  */
+@ProviderType
 public class ServiceLocator {
 
 	public static ServiceLocator getInstance() {
 		return _instance;
 	}
 
 	public Object findService(String serviceName) {
-		Object bean = null;
+		Object bean = PortalBeanLocatorUtil.locate(
+			_getServiceName(serviceName), true);
 
-		try {
-			bean = PortalBeanLocatorUtil.locate(_getServiceName(serviceName));
-		}
-		catch (Exception e) {
-			_log.error(e, e);
+		if (bean == null) {
+			Registry registry = RegistryUtil.getRegistry();
+
+			bean = registry.getService(serviceName);
 		}
 
 		return bean;

portal-impl/src/com/liferay/portal/template/packageinfo

@@ -1 +1 @@
-version 1.2.0
+version 1.2.1

portal-kernel/bnd.bnd

@@ -1,6 +1,6 @@
 Bundle-Name: ${manifest.bundle.name}
 Bundle-SymbolicName: ${manifest.bundle.symbolic.name}
-Bundle-Version: 2.4.0
+Bundle-Version: 2.5.0
 Export-Package:\
 	!com.liferay.portal.kernel.test.*,\
 	\

portal-kernel/src/com/liferay/portal/kernel/bean/PortalBeanLocatorUtil.java

@@ -14,6 +14,8 @@
 
 package com.liferay.portal.kernel.bean;
 
+import aQute.bnd.annotation.ProviderType;
+
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
 import com.liferay.portal.kernel.security.pacl.permission.PortalRuntimePermission;
@@ -25,6 +27,7 @@
  * @author Miguel Pastor
  * @author Raymond Augé
  */
+@ProviderType
 public class PortalBeanLocatorUtil {
 
 	public static BeanLocator getBeanLocator() {
@@ -37,10 +40,67 @@ public static BeanLocator getBeanLocator() {
 	public static <T> Map<String, T> locate(Class<T> clazz) {
 		BeanLocator beanLocator = getBeanLocator();
 
+		return _locate(beanLocator, clazz, false);
+	}
+
+	public static <T> Map<String, T> locate(Class<T> clazz, boolean silent) {
+		BeanLocator beanLocator = getBeanLocator();
+
+		return _locate(beanLocator, clazz, silent);
+	}
+
+	public static Object locate(String name) {
+		BeanLocator beanLocator = getBeanLocator();
+
+		return _locate(beanLocator, name, false);
+	}
+
+	public static Object locate(String name, boolean silent) {
+		BeanLocator beanLocator = getBeanLocator();
+
+		return _locate(beanLocator, name, silent);
+	}
+
+	public static void reset() {
+		setBeanLocator(null);
+	}
+
+	public static void setBeanLocator(BeanLocator beanLocator) {
+		PortalRuntimePermission.checkSetBeanProperty(
+			PortalBeanLocatorUtil.class);
+
+		if (_log.isDebugEnabled()) {
+			if (beanLocator == null) {
+				_log.debug("Setting BeanLocator " + beanLocator);
+			}
+			else {
+				_log.debug("Setting BeanLocator " + beanLocator.hashCode());
+			}
+		}
+
+		_beanLocator = beanLocator;
+	}
+
+	public interface PACL {
+
+		public ClassLoader getBeanLocatorClassLoader(BeanLocator beanLocator);
+
+		public ClassLoader getContextClassLoader(Thread currentThread);
+
+		public void setContextClassLoader(
+			Thread currentThread, ClassLoader classLoader);
+
+	}
+
+	private static <T> Map<String, T> _locate(
+		BeanLocator beanLocator, Class<T> clazz, boolean silent) {
+
 		if (beanLocator == null) {
 			_log.error("BeanLocator is null");
 
-			throw new BeanLocatorException("BeanLocator is not set");
+			if (!silent) {
+				throw new BeanLocatorException("BeanLocator is not set");
+			}
 		}
 
 		Thread currentThread = Thread.currentThread();
@@ -65,13 +125,15 @@ public static <T> Map<String, T> locate(Class<T> clazz) {
 		}
 	}
 
-	public static Object locate(String name) {
-		BeanLocator beanLocator = getBeanLocator();
+	private static Object _locate(
+		BeanLocator beanLocator, String name, boolean silent) {
 
 		if (beanLocator == null) {
 			_log.error("BeanLocator is null");
 
-			throw new BeanLocatorException("BeanLocator is not set");
+			if (!silent) {
+				throw new BeanLocatorException("BeanLocator is not set");
+			}
 		}
 
 		Thread currentThread = Thread.currentThread();
@@ -96,37 +158,6 @@ public static Object locate(String name) {
 		}
 	}
 
-	public static void reset() {
-		setBeanLocator(null);
-	}
-
-	public static void setBeanLocator(BeanLocator beanLocator) {
-		PortalRuntimePermission.checkSetBeanProperty(
-			PortalBeanLocatorUtil.class);
-
-		if (_log.isDebugEnabled()) {
-			if (beanLocator == null) {
-				_log.debug("Setting BeanLocator " + beanLocator);
-			}
-			else {
-				_log.debug("Setting BeanLocator " + beanLocator.hashCode());
-			}
-		}
-
-		_beanLocator = beanLocator;
-	}
-
-	public interface PACL {
-
-		public ClassLoader getBeanLocatorClassLoader(BeanLocator beanLocator);
-
-		public ClassLoader getContextClassLoader(Thread currentThread);
-
-		public void setContextClassLoader(
-			Thread currentThread, ClassLoader classLoader);
-
-	}
-
 	private static final Log _log = LogFactoryUtil.getLog(
 		PortalBeanLocatorUtil.class);
 

portal-kernel/src/com/liferay/portal/kernel/bean/packageinfo

@@ -1 +1 @@
-version 7.0.0
+version 7.1.0