From 858884151c84ffe228f293ae1652a50190b13022 Mon Sep 17 00:00:00 2001
From: Mika Koivisto <mika.koivisto@liferay.com>
Date: Mon, 29 Jul 2013 15:40:59 -0700
Subject: [PATCH] LPS-38337 Add missing portal-pacl and util-slf4j artifacts

---
 build-maven.xml             | 12 +++++++++++
 tools/maven/build.xml       | 20 ++++++++++++++++++
 tools/maven/portal-pacl.xml | 41 +++++++++++++++++++++++++++++++++++++
 tools/maven/util-slf4j.xml  | 23 +++++++++++++++++++++
 4 files changed, 96 insertions(+)
 create mode 100644 tools/maven/portal-pacl.xml
 create mode 100644 tools/maven/util-slf4j.xml

diff --git a/build-maven.xml b/build-maven.xml
index 630b1662cb0358..fb69933da23c84 100644
--- a/build-maven.xml
+++ b/build-maven.xml
@@ -93,20 +93,24 @@ for GPG setup instructions.
 	<target name="jar-javadoc">
 		<ant dir="portal-client" target="jar-javadoc" inheritAll="false" />
 		<ant dir="portal-impl" target="jar-javadoc" inheritAll="false" />
+		<ant dir="portal-pacl" target="jar-javadoc" inheritAll="false" />
 		<ant dir="portal-service" target="jar-javadoc" inheritAll="false" />
 		<ant dir="support-tomcat" target="jar-javadoc" inheritAll="false" />
 		<ant dir="util-bridges" target="jar-javadoc" inheritAll="false" />
 		<ant dir="util-java" target="jar-javadoc" inheritAll="false" />
+		<ant dir="util-slf4j" target="jar-javadoc" inheritAll="false" />
 		<ant dir="util-taglib" target="jar-javadoc" inheritAll="false" />
 	</target>
 
 	<target name="jar-sources">
 		<ant dir="portal-client" target="jar-sources" inheritAll="false" />
 		<ant dir="portal-impl" target="jar-sources" inheritAll="false" />
+		<ant dir="portal-pacl" target="jar-sources" inheritAll="false" />
 		<ant dir="portal-service" target="jar-sources" inheritAll="false" />
 		<ant dir="support-tomcat" target="jar-sources" inheritAll="false" />
 		<ant dir="util-bridges" target="jar-sources" inheritAll="false" />
 		<ant dir="util-java" target="jar-sources" inheritAll="false" />
+		<ant dir="util-slf4j" target="jar-sources" inheritAll="false" />
 		<ant dir="util-taglib" target="jar-sources" inheritAll="false" />
 	</target>
 
@@ -165,6 +169,10 @@ Run "ant -f build-dist.xml all zip-portal-war" to generate that file.
 				dir="portal-impl"
 				includes="portal-impl.jar,portal-impl-javadoc.jar,portal-impl-sources.jar"
 			/>
+			<fileset
+				dir="portal-pacl"
+				includes="portal-pacl.jar,portal-pacl-javadoc.jar,portal-pacl-sources.jar"
+				/>
 			<fileset
 				dir="portal-service"
 				includes="portal-service.jar,portal-service-javadoc.jar,portal-service-sources.jar"
@@ -181,6 +189,10 @@ Run "ant -f build-dist.xml all zip-portal-war" to generate that file.
 				dir="util-java"
 				includes="util-java.jar,util-java-javadoc.jar,util-java-sources.jar"
 			/>
+			<fileset
+				dir="util-slf4j"
+				includes="util-slf4j.jar,util-slf4j-javadoc.jar,util-slf4j-sources.jar"
+			/>
 			<fileset
 				dir="util-taglib"
 				includes="util-taglib.jar,util-taglib-javadoc.jar,util-taglib-sources.jar"
diff --git a/tools/maven/build.xml b/tools/maven/build.xml
index 40c11672b994c5..d77492aa2f8cb6 100644
--- a/tools/maven/build.xml
+++ b/tools/maven/build.xml
@@ -46,6 +46,11 @@
 			<param name="packaging" value="jar" />
 		</antcall>
 
+		<antcall target="deploy-artifact">
+			<param name="artifact.id" value="portal-pacl" />
+			<param name="packaging" value="jar" />
+		</antcall>
+
 		<antcall target="deploy-artifact">
 			<param name="artifact.id" value="portal-parent" />
 			<param name="packaging" value="pom" />
@@ -76,6 +81,11 @@
 			<param name="packaging" value="jar" />
 		</antcall>
 
+		<antcall target="deploy-artifact">
+			<param name="artifact.id" value="util-slf4j" />
+			<param name="packaging" value="jar" />
+		</antcall>
+
 		<antcall target="deploy-artifact">
 			<param name="artifact.id" value="util-taglib" />
 			<param name="packaging" value="jar" />
@@ -228,6 +238,11 @@
 			<param name="packaging" value="jar" />
 		</antcall>
 
+		<antcall target="install-artifact">
+			<param name="artifact.id" value="portal-pacl" />
+			<param name="packaging" value="jar" />
+		</antcall>
+
 		<antcall target="install-artifact">
 			<param name="artifact.id" value="portal-parent" />
 			<param name="packaging" value="pom" />
@@ -258,6 +273,11 @@
 			<param name="packaging" value="jar" />
 		</antcall>
 
+		<antcall target="install-artifact">
+			<param name="artifact.id" value="util-slf4j" />
+			<param name="packaging" value="jar" />
+		</antcall>
+
 		<antcall target="install-artifact">
 			<param name="artifact.id" value="util-taglib" />
 			<param name="packaging" value="jar" />
diff --git a/tools/maven/portal-pacl.xml b/tools/maven/portal-pacl.xml
new file mode 100644
index 00000000000000..eb0cee4ecc0d63
--- /dev/null
+++ b/tools/maven/portal-pacl.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.liferay.portal</groupId>
+		<artifactId>portal-parent</artifactId>
+		<version>@version@</version>
+	</parent>
+	<groupId>com.liferay.portal</groupId>
+	<artifactId>portal-pacl</artifactId>
+	<name>Liferay Portal PACL</name>
+	<version>@version@</version>
+	<description>Contains implementation for the portal security manager.</description>
+	<dependencies>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>portal-impl</artifactId>
+			<version>@version@</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>portal-service</artifactId>
+			<version>@version@</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>util-bridges</artifactId>
+			<version>@version@</version>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>util-java</artifactId>
+			<version>@version@</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
diff --git a/tools/maven/util-slf4j.xml b/tools/maven/util-slf4j.xml
new file mode 100644
index 00000000000000..113619434d1bbb
--- /dev/null
+++ b/tools/maven/util-slf4j.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>com.liferay.portal</groupId>
+		<artifactId>portal-parent</artifactId>
+		<version>@version@</version>
+	</parent>
+	<groupId>com.liferay.portal</groupId>
+	<artifactId>util-slf4j</artifactId>
+	<name>Liferay Util SLF4J</name>
+	<version>@version@</version>
+	<description>Contains Liferay SLF4J Binding. Classes are loaded separately for each plugin.</description>
+	<dependencies>
+		<dependency>
+			<groupId>com.liferay.portal</groupId>
+			<artifactId>portal-service</artifactId>
+			<version>@version@</version>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file