Lps 75364

.classpath

@@ -8,6 +8,7 @@
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="modules/apps/foundation/petra/petra-log4j/src/main/java"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="modules/apps/foundation/petra/petra-mail/src/main/java"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="modules/apps/foundation/petra/petra-memory/src/main/java"/>
+	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="modules/core/petra/petra-function/src/main/java"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="modules/core/petra/petra-nio/src/main/java"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="modules/core/petra/petra-string/src/main/java"/>
 	<classpathentry excluding="**/.svn/**|.svn/" kind="src" path="modules/core/registry-api/src/main/java"/>

.m2-tmp/com/liferay/com.liferay.petra.function/1.0.0/com.liferay.petra.function-1.0.0.pom

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.liferay</groupId>
+  <artifactId>com.liferay.petra.function</artifactId>
+  <version>1.0.0</version>
+  <description>Liferay Petra Function</description>
+  <licenses>
+    <license>
+      <name>LGPL 2.1</name>
+      <url>http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <name>Brian Wing Shun Chan</name>
+      <organization>Liferay, Inc.</organization>
+      <organizationUrl>http://www.liferay.com</organizationUrl>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git@github.com:liferay/liferay-plugins.git</connection>
+    <developerConnection>scm:git:git@github.com:liferay/liferay-plugins.git</developerConnection>
+    <url>http://github.com/liferay/liferay-plugins</url>
+  </scm>
+</project>

modules/apps/analytics/.gitrepo

@@ -4,8 +4,8 @@
 [subrepo]
 	autopull = true
 	cmdver = liferay
-	commit = 1750598a28864f8f7c01661eb1660824e5b2237b
+	commit = 87c486599eb9468fd13c4fbd844171cc8686de7c
 	mergebuttonmergecommits = false
 	mode = pull
-	parent = 3f0e5a58906d54a2693a7cee5ae60986f7e7cc2a
+	parent = 160202f0dc92174dc0cb2f13a0abf2dcc88f3bde
 	remote = git@github.com:liferay/com-liferay-analytics.git

modules/apps/analytics/analytics-java-client/src/main/java/com/liferay/analytics/java/client/AnalyticsClient.java

@@ -17,7 +17,6 @@
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -28,19 +27,17 @@
 public class AnalyticsClient {
 
 	public Response sendAnalytics(
-		AnalyticsEventsMessage analyticsEventMessage) {
+		AnalyticsEventsMessage analyticsEventsMessage) {
 
 		WebTarget webTarget = _client.target(_ANALYTICS_GATEWAY_URL);
 
-		Invocation.Builder request = webTarget.request(
-			MediaType.APPLICATION_JSON);
-
-		return request.post(
-			Entity.entity(analyticsEventMessage, MediaType.APPLICATION_JSON));
+		return webTarget.request(MediaType.APPLICATION_JSON).post(
+			Entity.entity(analyticsEventsMessage, MediaType.APPLICATION_JSON));
 	}
 
-	private static final String _ANALYTICS_GATEWAY_URL =
-		"http://54.235.215.13:8095/api/analyticsgateway/send-analytics-events";
+	private static final String _ANALYTICS_GATEWAY_URL = System.getProperty(
+		"analytics.gateway.url",
+		"http://54.235.215.13:8095/api/analyticsgateway/send-analytics-events");
 
 	private final Client _client = ClientBuilder.newClient();