Lps 61278

.gradle/caches/modules-2/files-2.1/com.liferay/org.phidias/0.3.7.LIFERAY-PATCHED-4/5e27da01778eea35b15df2e6accc1994729c8cb5/org.phidias-0.3.7.LIFERAY-PATCHED-4.pom

@@ -0,0 +1,35 @@
+<?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>org.phidias</artifactId>
+  <version>0.3.7.LIFERAY-PATCHED-4</version>
+  <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>
+  <dependencies>
+    <dependency>
+      <groupId>com.github.rotty3000</groupId>
+      <artifactId>phidias</artifactId>
+      <version>0.3.7</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>

modules/portal/portal-servlet-jsp-compiler/build.gradle

@@ -10,7 +10,7 @@ classes {
 
 dependencies {
 	compile group: "com.liferay", name: "com.liferay.osgi.util", version: "2.0.4"
-	compile group: "com.liferay", name: "org.phidias", version: "0.3.7.LIFERAY-PATCHED-3"
+	compile group: "com.liferay", name: "org.phidias", version: "0.3.7.LIFERAY-PATCHED-4"
 	compile group: "com.liferay.portal", name: "util-taglib", version: liferay.portalVersion
 	compile group: "org.glassfish", name: "javax.el", transitive: false, version: "3.0.1-b05"
 	compile group: "org.glassfish", name: "javax.servlet", transitive: false, version: "3.2-b06"

modules/third-party/org-phidias/bnd.bnd

@@ -1,3 +1,3 @@
 Bundle-SymbolicName: org.phidias
-Bundle-Version: 0.3.7.LIFERAY-PATCHED-3
+Bundle-Version: 0.3.7.LIFERAY-PATCHED-4
 Include-Resource: classes

modules/third-party/org-phidias/patches/LPS-61271.patch

@@ -2,7 +2,7 @@ diff --git a/org/phidias/compile/BundleJavaManager.java b/org/phidias/compile/Bu
 index 44b7206..74052d5 100644
 --- a/org/phidias/compile/BundleJavaManager.java
 +++ b/org/phidias/compile/BundleJavaManager.java
-@@ -230,12 +230,17 @@ public class BundleJavaManager
+@@ -230,12 +230,17 @@ public class BundleJavaManager/* @generated */
  		return resourceName.replace('/', '.');
  	}
 

modules/third-party/org-phidias/patches/LPS-61275.patch

@@ -135,10 +135,15 @@ index 8bf7a42..f8adf8c 100644
  			javaFileObjects.add(javaFileObject);
  		}
 diff --git a/org/phidias/compile/ClassLoaderJavaManager.java b/org/phidias/compile/ClassLoaderJavaManager.java
-index e784eef..8679c2e 100644
+index e784eef..78810e7 100644
 --- a/org/phidias/compile/ClassLoaderJavaManager.java
 +++ b/org/phidias/compile/ClassLoaderJavaManager.java
-@@ -125,7 +125,9 @@ public class ClassLoaderJavaManager
+@@ -1,3 +1,4 @@
++/* @generated */
+ /**
+  * Copyright 2012 Liferay Inc.
+  *
+@@ -125,7 +126,9 @@ public class ClassLoaderJavaManager
  			BundleJavaFileObject bundleJavaFileObject =
  				(BundleJavaFileObject)file;
 
@@ -149,7 +154,7 @@ index e784eef..8679c2e 100644
 
  			return bundleJavaFileObject.inferBinaryName();
  		}
-@@ -141,7 +143,7 @@ public class ClassLoaderJavaManager
+@@ -141,7 +144,7 @@ public class ClassLoaderJavaManager
 
  		List<JavaFileObject> javaFileObjects = new ArrayList<JavaFileObject>();
 
@@ -158,7 +163,7 @@ index e784eef..8679c2e 100644
  			_log.log(
  				"List available sources for {location=" + location +
  					", packageName=" + packageName + ", kinds=" + kinds +
-@@ -172,7 +174,9 @@ public class ClassLoaderJavaManager
+@@ -172,7 +175,9 @@ public class ClassLoaderJavaManager
  			for (JavaFileObject javaFileObject : _javaFileManager.list(
  					location, packagePath, kinds, recurse)) {
 
@@ -170,10 +175,15 @@ index e784eef..8679c2e 100644
  				}
 
 diff --git a/org/phidias/compile/TPhLog.java b/org/phidias/compile/TPhLog.java
-index d3c8d53..c17e00c 100644
+index d3c8d53..aa559c6 100644
 --- a/org/phidias/compile/TPhLog.java
 +++ b/org/phidias/compile/TPhLog.java
-@@ -30,6 +30,10 @@ public class TPhLog {
+@@ -1,3 +1,4 @@
++/* @generated */
+ /**
+  * Copyright 2012 Liferay Inc.
+  *
+@@ -30,6 +31,10 @@ public class TPhLog {
  	public PrintStream out;
  	public String pattern = "%1$tH:%1$tM:%1$tS,%1$tL [%2$s:%3$d] %4$s %5$s\n";
 

modules/third-party/org-phidias/patches/LPS-61278.patch

@@ -0,0 +1,86 @@
+diff --git a/org/phidias/compile/BundleJavaManager.java b/org/phidias/compile/BundleJavaManager.java
+index f8adf8c..cb3aeeb 100644
+--- a/org/phidias/compile/BundleJavaManager.java
++++ b/org/phidias/compile/BundleJavaManager.java
+@@ -25,6 +25,7 @@ import java.net.URL;/* @generated */
+
+ import java.util.ArrayList;
+ import java.util.Collection;
++import java.util.HashSet;
+ import java.util.List;
+ import java.util.Map;
+ import java.util.Set;
+@@ -110,7 +111,21 @@ public class BundleJavaManager
+ 			Bundle curBundle = providerWiring.getBundle();
+
+ 			if (_strict && (curBundle.getBundleId() == 0)) {
+-				_systemBundleWiring = providerWiring;
++				List<BundleCapability> bundleCapabilities =
++					providerWiring.getCapabilities(
++						BundleRevision.PACKAGE_NAMESPACE);
++
++				for (BundleCapability bundleCapability : bundleCapabilities) {
++					Map<String, Object> attributes =
++						bundleCapability.getAttributes();
++
++					Object packageNamespace = attributes.get(
++						BundleRevision.PACKAGE_NAMESPACE);
++
++					if (packageNamespace != null) {
++						_systemCapabilities.add(packageNamespace);
++					}
++				}
+ 			}
+
+ 			if (_log.isEnabled()) {
+@@ -121,11 +136,6 @@ public class BundleJavaManager
+
+ 			_bundleWirings.add(providerWiring);
+ 		}
+-
+-		if (_strict && (_systemBundleWiring != null)) {
+-			_systemCapabilities = _systemBundleWiring.getCapabilities(
+-				BundleRevision.PACKAGE_NAMESPACE);
+-		}
+ 	}
+
+ 	public void addBundleRequirement(BundleRequirement bundleRequirement) {
+@@ -321,27 +331,7 @@ public class BundleJavaManager
+ 		// if mode is strict. Otherwise, allow loading classes from the defined
+ 		// classpath.
+
+-		return (_systemBundleWiring != null) &&
+-			hasPackageCapability(_systemCapabilities, packageName);
+-	}
+-
+-	private boolean hasPackageCapability(
+-		List<BundleCapability> capabilities, String packageName) {
+-
+-		for (BundleCapability capability : capabilities) {
+-			Map<String, Object> attributes = capability.getAttributes();
+-
+-			Object packageAttribute = attributes.get(
+-				BundleRevision.PACKAGE_NAMESPACE);
+-
+-			if ((packageAttribute != null) &&
+-				packageAttribute.equals(packageName)) {
+-
+-				return true;
+-			}
+-		}
+-
+-		return false;
++		return _systemCapabilities.contains(packageName);
+ 	}
+
+ 	private void list(
+@@ -426,7 +416,6 @@ public class BundleJavaManager
+ 	private List<BundleRequirement> _packageRequirements;
+ 	private ResourceResolver _resourceResolver;
+ 	private boolean _strict;
+-	private BundleWiring _systemBundleWiring;
+-	private List<BundleCapability> _systemCapabilities;
++	private final Set<Object> _systemCapabilities = new HashSet<Object>();
+
+ }
+\ No newline at end of file

modules/third-party/org-phidias/src/main/java/org/phidias/compile/BundleJavaManager.java

@@ -26,6 +26,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -111,7 +112,21 @@ public BundleJavaManager(
 			Bundle curBundle = providerWiring.getBundle();
 
 			if (_strict && (curBundle.getBundleId() == 0)) {
-				_systemBundleWiring = providerWiring;
+				List<BundleCapability> bundleCapabilities =
+					providerWiring.getCapabilities(
+						BundleRevision.PACKAGE_NAMESPACE);
+
+				for (BundleCapability bundleCapability : bundleCapabilities) {
+					Map<String, Object> attributes =
+						bundleCapability.getAttributes();
+
+					Object packageNamespace = attributes.get(
+						BundleRevision.PACKAGE_NAMESPACE);
+
+					if (packageNamespace != null) {
+						_systemCapabilities.add(packageNamespace);
+					}
+				}
 			}
 
 			if (_log.isEnabled()) {
@@ -122,11 +137,6 @@ public BundleJavaManager(
 
 			_bundleWirings.add(providerWiring);
 		}
-
-		if (_strict && (_systemBundleWiring != null)) {
-			_systemCapabilities = _systemBundleWiring.getCapabilities(
-				BundleRevision.PACKAGE_NAMESPACE);
-		}
 	}
 
 	public void addBundleRequirement(BundleRequirement bundleRequirement) {
@@ -322,27 +332,7 @@ private boolean hasPackageCapability(String packageName) {
 		// if mode is strict. Otherwise, allow loading classes from the defined
 		// classpath.
 
-		return (_systemBundleWiring != null) &&
-			hasPackageCapability(_systemCapabilities, packageName);
-	}
-
-	private boolean hasPackageCapability(
-		List<BundleCapability> capabilities, String packageName) {
-
-		for (BundleCapability capability : capabilities) {
-			Map<String, Object> attributes = capability.getAttributes();
-
-			Object packageAttribute = attributes.get(
-				BundleRevision.PACKAGE_NAMESPACE);
-
-			if ((packageAttribute != null) &&
-				packageAttribute.equals(packageName)) {
-
-				return true;
-			}
-		}
-
-		return false;
+		return _systemCapabilities.contains(packageName);
 	}
 
 	private void list(
@@ -427,7 +417,6 @@ private void setOptions(List<String> options) {
 	private List<BundleRequirement> _packageRequirements;
 	private ResourceResolver _resourceResolver;
 	private boolean _strict;
-	private BundleWiring _systemBundleWiring;
-	private List<BundleCapability> _systemCapabilities;
+	private final Set<Object> _systemCapabilities = new HashSet<Object>();
 
 }

modules/third-party/org-phidias/src/main/java/org/phidias/compile/ClassLoaderJavaManager.java

@@ -1,3 +1,4 @@
+/* @generated */
 /**
  * Copyright 2012 Liferay Inc.
  *

modules/third-party/org-phidias/src/main/java/org/phidias/compile/TPhLog.java

@@ -1,3 +1,4 @@
+/* @generated */
 /**
  * Copyright 2012 Liferay Inc.
  *