MAVEN-207 Reuse toolsClassLoader rather than creating a new one each …

…time
brianchandotcom · Jan 21, 2016 · 3f42175 · 3f42175
1 parent e551141
commit 3f42175
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/...iferay-maven-plugin/src/main/java/com/liferay/maven/plugins/AbstractToolsLiferayMojo.java b/...iferay-maven-plugin/src/main/java/com/liferay/maven/plugins/AbstractToolsLiferayMojo.java
@@ -329,7 +329,11 @@ protected List<String> getProjectClassPath() throws Exception {
 	}
 
 	protected ClassLoader getToolsClassLoader() throws Exception {
-		return toClassLoader(getToolsClassPath());
+		if (_toolsClassLoader == null) {
+			_toolsClassLoader = toClassLoader(getToolsClassPath());
+		}
+
+		return _toolsClassLoader;
 	}
 
 	protected ClassLoader getToolsClassLoader(Dependency[] dependencies)
@@ -726,4 +730,5 @@ protected ClassLoader toClassLoader(List<String> classPath)
 	private static Pattern _majorVersionPattern = Pattern.compile(
 		"(\\d+[.]\\d+)");
 
+	private static ClassLoader _toolsClassLoader;
 }
diff --git a/...iferay-maven-plugin/src/main/java/com/liferay/maven/plugins/PluginDirectDeployerMojo.java b/...iferay-maven-plugin/src/main/java/com/liferay/maven/plugins/PluginDirectDeployerMojo.java
@@ -220,7 +220,7 @@ protected void deployExtWeb(File extWebDocrootDir) throws Exception {
 		};
 
 		executeTool(
-			"com.liferay.portal.tools.WebXMLBuilder", getProjectClassLoader(),
+			"com.liferay.portal.tools.WebXMLBuilder", getToolsClassLoader(),
 			args);
 
 		FileUtil.move(mergedWebXml, originalWebXml);
@@ -229,13 +229,13 @@ protected void deployExtWeb(File extWebDocrootDir) throws Exception {
 	protected void deployHook() throws Exception {
 		executeTool(
 			"com.liferay.portal.tools.deploy.HookDeployer",
-			getProjectClassLoader(), getRequiredPortalJars());
+			getToolsClassLoader(), getRequiredPortalJars());
 	}
 
 	protected void deployLayoutTemplate() throws Exception {
 		executeTool(
 			"com.liferay.portal.tools.deploy.LayoutTemplateDeployer",
-			getProjectClassLoader(), getRequiredPortalJars());
+			getToolsClassLoader(), getRequiredPortalJars());
 	}
 
 	protected void deployPortlet() throws Exception {
@@ -260,7 +260,7 @@ protected void deployPortlet() throws Exception {
 
 		executeTool(
 			"com.liferay.portal.tools.deploy.PortletDeployer",
-			getProjectClassLoader(), getRequiredPortalJars());
+			getToolsClassLoader(), getRequiredPortalJars());
 	}
 
 	protected void deployTheme() throws Exception {
@@ -273,13 +273,13 @@ protected void deployTheme() throws Exception {
 
 		executeTool(
 			"com.liferay.portal.tools.deploy.ThemeDeployer",
-			getProjectClassLoader(), getRequiredPortalJars());
+			getToolsClassLoader(), getRequiredPortalJars());
 	}
 
 	protected void deployWeb() throws Exception {
 		executeTool(
 			"com.liferay.portal.tools.deploy.WebDeployer",
-			getProjectClassLoader(), getRequiredPortalJars());
+			getToolsClassLoader(), getRequiredPortalJars());
 	}
 
 	protected void doExecute() throws Exception {