MAVEN-18

Try to cleanup

Author: barrieselack

plugins/liferay-maven-plugin/src/main/java/com/liferay/maven/plugins/ExtBuilderMojo.java

@@ -327,7 +327,7 @@ protected void unpack(
 	private ArtifactRepository localArtifactRepository;
 
 	/**
-	 * @parameter default-value="${project.artifactId}" expression="${pluginName}"
+	 * @parameter expression="${project.artifactId}"
 	 * @required
 	 */
 	private String pluginName;
@@ -354,28 +354,24 @@ protected void unpack(
 	private List remoteArtifactRepositories;
 
 	/**
-	 * @parameter default-value="${basedir}/src/main/webapp/WEB-INF/sql"
+	 * @parameter expression="${basedir}/src/main/webapp/WEB-INF/sql"
 	 * @required
 	 */
 	private File sqlSourceDir;
 
 	/**
-<<<<<<< Updated upstream
-	 * @parameter default-value="${project.build.directory}/${project.build.finalName}"
-=======
 	 * @parameter default-value="false"
 	 */
 	private boolean addVersionAndClassifier;
 
 	/**
 	 * @parameter expression="${project.build.directory}/${project.build.finalName}"
->>>>>>> Stashed changes
 	 * @required
 	 */
 	private File webappDir;
 
 	/**
-	 * @parameter default-value="${project.build.directory}/liferay-work"
+	 * @parameter expression="${project.build.directory}/liferay-work"
 	 * @required
 	 */
 	private File workDir;

plugins/liferay-maven-plugin/src/main/java/com/liferay/maven/plugins/PluginDirectDeployerMojo.java

@@ -18,22 +18,16 @@
 import com.liferay.portal.cache.memory.MemoryPortalCacheManager;
 import com.liferay.portal.kernel.cache.MultiVMPoolUtil;
 import com.liferay.portal.kernel.util.PropsKeys;
-<<<<<<< Updated upstream
-import com.liferay.portal.kernel.util.FileUtil;
-import com.liferay.portal.tools.WebXMLBuilder;
-=======
 import com.liferay.portal.kernel.util.StringPool;
 import com.liferay.portal.tools.WebXMLBuilder;
 import com.liferay.portal.tools.deploy.ExtDeployer;
->>>>>>> Stashed changes
 import com.liferay.portal.tools.deploy.HookDeployer;
 import com.liferay.portal.tools.deploy.LayoutTemplateDeployer;
 import com.liferay.portal.tools.deploy.PortletDeployer;
 import com.liferay.portal.tools.deploy.ThemeDeployer;
 import com.liferay.portal.tools.deploy.WebDeployer;
 import com.liferay.portal.util.InitUtil;
 import com.liferay.portal.util.PropsUtil;
-import com.liferay.util.ant.CopyTask;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -79,21 +73,15 @@ protected void doExecute() throws Exception {
 		if (!warFile.exists()) {
 			getLog().error(warFileName + " does not exist");
 
-			throw new FileNotFoundException(warFileName + " does not exist");
+			throw new FileNotFoundException(warFileName + " does not exist!");
 		}
 
 		getLog().info("Directly deploying " + warFileName);
 
 		getLog().debug("appServerType: " + appServerType);
-//		getLog().debug("appServerGlobalLibDir: " + appServerGlobalLibDir.getAbsolutePath());
-//		getLog().debug("appServerLiferayRootDir: " + appServerLiferayRootDir.getAbsolutePath());
 		getLog().debug("baseDir: " + baseDir);
-<<<<<<< Updated upstream
-		getLog().debug("deployDir: " + appServerDeployDir.getAbsolutePath());
-=======
 		getLog().debug("deployDir: " + deployDir.getAbsolutePath());
 		getLog().debug("extDir: " + extDir.getAbsolutePath());
->>>>>>> Stashed changes
 		getLog().debug("jbossPrefix: " + jbossPrefix);
 		getLog().debug("pluginType: " + pluginType);
 		getLog().debug("projectName: " + projectName);
@@ -103,8 +91,7 @@ protected void doExecute() throws Exception {
 
 		System.setProperty("deployer.app.server.type", appServerType);
 		System.setProperty("deployer.base.dir", baseDir);
-		System.setProperty(
-			"deployer.dest.dir", appServerDeployDir.getAbsolutePath());
+		System.setProperty("deployer.dest.dir", deployDir.getAbsolutePath());
 		System.setProperty("deployer.file.pattern", warFileName);
 		System.setProperty("deployer.unpack.war", String.valueOf(unpackWar));
 		System.setProperty(
@@ -134,79 +121,20 @@ else if (pluginType.equals("web")) {
 	}
 
 	protected void deployExt() throws Exception {
-<<<<<<< Updated upstream
-		workDir.mkdirs();
-
-		UnArchiver unArchiver = archiverManager.getUnArchiver(warFile);
-
-		unArchiver.setDestDirectory(workDir);
-		unArchiver.setSourceFile(warFile);
-
-		unArchiver.extract();
-
-		CopyTask.copyDirectory(
-			new File(workDir, "WEB-INF/ext-lib/global"), appServerLibGlobalDir,
-			"*.jar", null, true, true);
-
-		CopyTask.copyFile(
-			new File(workDir, "WEB-INF/ext-service/ext-service.jar"),
-			appServerLibGlobalDir, "ext-" + pluginName + "-service.jar", null,
-			true, true);
-
-		CopyTask.copyDirectory(
-			new File(workDir, "WEB-INF/ext-lib/portal"), appServerLibPortalDir,
-			"*.jar", null, true, true);
-
-		CopyTask.copyFile(
-			new File(workDir, "WEB-INF/ext-impl/ext-impl.jar"),
-			appServerLibGlobalDir, "ext-" + pluginName + "-impl.jar", null, true,
-			true);
-
-		CopyTask.copyFile(
-			new File(workDir, "WEB-INF/ext-util-bridges/ext-util-bridges.jar"),
-			appServerLibGlobalDir, "ext-" + pluginName + "-util-bridges.jar",
-			null, true, true);
-
-		CopyTask.copyFile(
-			new File(workDir, "WEB-INF/ext-util-java/ext-util-java.jar"),
-			appServerLibGlobalDir, "ext-" + pluginName + "-util-java.jar", null,
-			true, true);
-
-		CopyTask.copyFile(
-			new File(workDir, "WEB-INF/ext-util-taglib/ext-util-taglib.jar"),
-			appServerLibGlobalDir, "ext-" + pluginName + "-util-taglib.jar",
-			null, true, true);
-
-		CopyTask.copyDirectory(
-			new File(workDir, "WEB-INF/ext-web/docroot"), appServerPortalDir,
-			null, "WEB-INF/web.xml", true, true);
-
-		File webXml = new File(
-			workDir, "WEB-INF/ext-web/docroot/WEB-INF/web.xml");
-
-		if (webXml.exists()) {
-			File originalWebXml = new File(
-				appServerPortalDir, "WEB-INF/web.xml");
-			File mergedWebXml = new File(
-				appServerPortalDir, "WEB-INF/web.xml.merged");
-
-			new WebXMLBuilder(
-				originalWebXml.getAbsolutePath(), webXml.getAbsolutePath(),
-				mergedWebXml.getAbsolutePath());
-
-			FileUtil.move(mergedWebXml, originalWebXml);
+		
+		if (appServerGlobalLibDir == null || appServerGlobalLibDir.equals(StringPool.BLANK)) {
+			getLog().error("appServerGlobalLibDir configuration is required for ext direct-deploy");
+			System.exit(-1);
+		}
+		
+		if (appServerLiferayRootDir == null || appServerLiferayRootDir.equals(StringPool.BLANK)) {
+			getLog().error("appServerLiferayRootDir configuration is required for ext direct-deploy");
+			System.exit(-1);
 		}
-
-		CopyTask.copyFile(
-			new File(workDir, "WEB-INF/ext-" + pluginName + ".xml"),
-			appServerPortalDir, null, true, true);
-
-		CopyTask.copyDirectory(
-			new File(workDir, "WEB-INF/ext-web/docroot/WEB-INF/classes"),
-			appServerClassesPortalDir,
-			"portal-*.properties,system-*.properties", null, true, true);
-=======
 
+		getLog().debug("appServerGlobalLibDir: " + appServerGlobalLibDir.getAbsolutePath());
+		getLog().debug("appServerLiferayRootDir: " + appServerLiferayRootDir.getAbsolutePath());
+
 		File appServerLiferayWebInfDir = new File(appServerLiferayRootDir + 
 				StringPool.FORWARD_SLASH + "WEB-INF");
 
@@ -267,7 +195,6 @@ protected void deployExt() throws Exception {
 				new File(appServerLiferayWebInfDir, StringPool.FORWARD_SLASH +
 						"ext-" + projectName + ".xml"));
 
->>>>>>> Stashed changes
 	}
 
 	protected void deployHook() throws Exception {
@@ -407,35 +334,6 @@ protected void preparePortalDependencies() throws Exception {
 		unArchiver.extract();
 	}
 
-	/**
-	 * @parameter default-value="${appServerPortalDir}/WEB-INF/classes" expression="${appServerClassesPortalDir}"
-	 * @required
-	 */
-	private File appServerClassesPortalDir;
-
-	/**
-	 * @parameter default-value="${deployDir}" expression="${appServerDeployDir}"
-	 * @required
-	 */
-	private File appServerDeployDir;
-
-	/**
-	 * @parameter expression="${appServerLibGlobalDir}"
-	 * @required
-	 */
-	private File appServerLibGlobalDir;
-
-	/**
-	 * @parameter expression="${appServerPortalDir}"
-	 * @required
-	 */
-	private File appServerPortalDir;
-
-	/**
-	 * @parameter default-value="${appServerPortalDir}/WEB-INF/lib" expression="${appServerLibPortalDir}"
-	 */
-	private File appServerLibPortalDir;
-
 	/**
 	 * @parameter default-value="tomcat" expression="${appServerType}"
 	 * @required
@@ -480,24 +378,19 @@ protected void preparePortalDependencies() throws Exception {
 	private boolean customPortletXml;
 
 	/**
-	 * @deprecated
 	 * @parameter expression="${deployDir}"
-	 * @since 6.1.1
+	 * @required
 	 */
 	private File deployDir;
 
 	/**
-<<<<<<< Updated upstream
-	 * @parameter expression="${jbossPrefix}"
-=======
 	 * @parameter expression="${project.build.directory}/${project.build.finalName}"
 	 * @required
 	 */
 	private File extDir;
 
 	/**
 	 * @parameter default-value="" expression="${jbossPrefix}"
->>>>>>> Stashed changes
 	 */
 	private String jbossPrefix;
 
@@ -514,12 +407,6 @@ protected void preparePortalDependencies() throws Exception {
 	 */
 	private ArtifactRepository localArtifactRepository;
 
-	/**
-	 * @parameter default-value="${project.artifactId}" expression="${pluginName}"
-	 * @required
-	 */
-	private String pluginName;
-
 	/**
 	 * @parameter default-value="portlet" expression="${pluginType}"
 	 * @required
@@ -540,25 +427,25 @@ protected void preparePortalDependencies() throws Exception {
 	private List remoteArtifactRepositories;
 
 	/**
-	 * @parameter default-value="true" expression="${unpackWar}"
+	 * @parameter expression="${unpackWar}" default-value="true"
 	 * @required
 	 */
 	private boolean unpackWar;
 
 	/**
-	 * @parameter default-value="${project.build.directory}/${project.build.finalName}.war" expression="${warFile}"
+	 * @parameter expression="${project.build.directory}/${project.build.finalName}.war"
 	 * @required
 	 */
 	private File warFile;
 
 	/**
-	 * @parameter default-value="${project.build.finalName}.war" expression="${warFileName}
+	 * @parameter expression="${project.build.finalName}.war"
 	 * @required
 	 */
 	private String warFileName;
 
 	/**
-	 * @parameter default-value="${project.build.directory}/liferay-work"
+	 * @parameter expression="${project.build.directory}/liferay-work"
 	 * @required
 	 */
 	private File workDir;