BaseDB.java use templateManager

BaseDB.java.patch

@@ -23,8 +23,12 @@ import com.liferay.portal.kernel.dao.db.IndexMetadataFactoryUtil;
 import com.liferay.portal.kernel.dao.jdbc.DataAccess;
 import com.liferay.portal.kernel.io.unsync.UnsyncBufferedReader;
 import com.liferay.portal.kernel.io.unsync.UnsyncStringReader;
+import com.liferay.portal.kernel.io.unsync.UnsyncStringWriter;
 import com.liferay.portal.kernel.log.Log;
 import com.liferay.portal.kernel.log.LogFactoryUtil;
+import com.liferay.portal.kernel.template.StringTemplateResource;
+import com.liferay.portal.kernel.template.Template;
+import com.liferay.portal.kernel.template.TemplateManagerUtil;
 import com.liferay.portal.kernel.util.FileUtil;
 import com.liferay.portal.kernel.util.GetterUtil;
 import com.liferay.portal.kernel.util.StringBundler;
@@ -33,7 +37,6 @@ import com.liferay.portal.kernel.util.StringUtil;
 import com.liferay.portal.kernel.util.Validator;
 import com.liferay.portal.kernel.uuid.PortalUUIDUtil;
 import com.liferay.portal.util.ClassLoaderUtil;
-import com.liferay.portal.velocity.VelocityUtil;
 import com.liferay.util.SimpleCounter;
 
 import java.io.File;
@@ -756,7 +759,15 @@ public abstract class BaseDB implements DB {
 			ClassLoaderUtil.setContextClassLoader(
 				ClassLoaderUtil.getPortalClassLoader());
 
-			template = VelocityUtil.evaluate(template, variables);
+			Template templateObject = TemplateManagerUtil.getTemplate(
+				template, new StringTemplateResource(
+					String.valueOf(template.hashCode()), template), false);
+
+			UnsyncStringWriter unsyncStringWriter = new UnsyncStringWriter();
+
+			templateObject.doProcessTemplate(unsyncStringWriter);
+
+			template = unsyncStringWriter.toString();
 		}
 		finally {
 			ClassLoaderUtil.setContextClassLoader(classLoader);