Author: olli
Date: Fri Apr 29 07:50:27 2016
New Revision: 1741562
URL: http://svn.apache.org/viewvc?rev=1741562&view=rev
Log:
SLING-5603 Upgrade Commons Lang to 3.4
Modified:
sling/trunk/bundles/extensions/healthcheck/core/pom.xml
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxAdjustableStatusForTesting.java
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/AsyncHealthCheckExecutor.java
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/HealthCheckExecutorServlet.java
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
Modified: sling/trunk/bundles/extensions/healthcheck/core/pom.xml
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/pom.xml?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/healthcheck/core/pom.xml (original)
+++ sling/trunk/bundles/extensions/healthcheck/core/pom.xml Fri Apr 29 07:50:27
2016
@@ -80,6 +80,18 @@
</execution>
</executions>
</plugin>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>depends-maven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>generate-depends-file</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
@@ -214,10 +226,10 @@
</dependency>
<dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.4</version>
+ <scope>provided</scope>
</dependency>
<dependency>
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxAdjustableStatusForTesting.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxAdjustableStatusForTesting.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxAdjustableStatusForTesting.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/JmxAdjustableStatusForTesting.java
Fri Apr 29 07:50:27 2016
@@ -35,7 +35,7 @@ import javax.management.MBeanOperationIn
import javax.management.MBeanParameterInfo;
import javax.management.ReflectionException;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/AsyncHealthCheckExecutor.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/AsyncHealthCheckExecutor.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/AsyncHealthCheckExecutor.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/AsyncHealthCheckExecutor.java
Fri Apr 29 07:50:27 2016
@@ -27,7 +27,7 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.ConcurrentHashMap;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckExecutorImpl.java
Fri Apr 29 07:50:27 2016
@@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/executor/HealthCheckFuture.java
Fri Apr 29 07:50:27 2016
@@ -23,7 +23,7 @@ import java.util.Date;
import java.util.concurrent.Callable;
import java.util.concurrent.FutureTask;
-import org.apache.commons.lang.time.StopWatch;
+import org.apache.commons.lang3.time.StopWatch;
import org.apache.sling.hc.api.HealthCheck;
import org.apache.sling.hc.api.Result;
import org.apache.sling.hc.api.execution.HealthCheckExecutionResult;
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/HealthCheckExecutorServlet.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/HealthCheckExecutorServlet.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/HealthCheckExecutorServlet.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/HealthCheckExecutorServlet.java
Fri Apr 29 07:50:27 2016
@@ -29,8 +29,8 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
@@ -281,7 +281,7 @@ public class HealthCheckExecutorServlet
sb.append("<h3>Supported URL parameters</h3>\n");
for(Param p : PARAM_LIST) {
sb.append("<b>").append(p.name).append("</b>:");
- sb.append(StringEscapeUtils.escapeHtml(p.description));
+ sb.append(StringEscapeUtils.escapeHtml4(p.description));
sb.append("<br/>");
}
return sb.toString();
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultHtmlSerializer.java
Fri Apr 29 07:50:27 2016
@@ -26,8 +26,8 @@ import java.util.Date;
import java.util.Dictionary;
import java.util.List;
-import org.apache.commons.lang.StringEscapeUtils;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringEscapeUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
@@ -88,10 +88,10 @@ public class ResultHtmlSerializer {
for (HealthCheckExecutionResult executionResult : executionResults) {
Result result = executionResult.getHealthCheckResult();
writer.println("<tr class=\"" +
getClassForStatus(result.getStatus()) + "\" "
- + "title=\"Tags: " +
StringEscapeUtils.escapeHtml(StringUtils.join(executionResult.getHealthCheckMetadata().getTags(),
",")) + "\">");
- writer.println("<td><span title=\"" +
StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getName())
+ "\">"
- +
StringEscapeUtils.escapeHtml(executionResult.getHealthCheckMetadata().getTitle())
+ "</span></td>");
- writer.println("<td style='font-weight:bold;'>" +
StringEscapeUtils.escapeHtml(result.getStatus().toString()) + "</td>");
+ + "title=\"Tags: " +
StringEscapeUtils.escapeHtml4(StringUtils.join(executionResult.getHealthCheckMetadata().getTags(),
",")) + "\">");
+ writer.println("<td><span title=\"" +
StringEscapeUtils.escapeHtml4(executionResult.getHealthCheckMetadata().getName())
+ "\">"
+ +
StringEscapeUtils.escapeHtml4(executionResult.getHealthCheckMetadata().getTitle())
+ "</span></td>");
+ writer.println("<td style='font-weight:bold;'>" +
StringEscapeUtils.escapeHtml4(result.getStatus().toString()) + "</td>");
writer.println("<td>");
boolean isFirst = true;
@@ -110,15 +110,15 @@ public class ResultHtmlSerializer {
boolean showStatus = !isSingleResult &&
entry.getStatus()!=Result.Status.DEBUG && entry.getStatus()
!=Result.Status.INFO;
- String message =
StringEscapeUtils.escapeHtml(entry.getMessage());
+ String message =
StringEscapeUtils.escapeHtml4(entry.getMessage());
if(entry.getStatus()==Result.Status.DEBUG) {
message = "<span style='color:gray'/>"+message +
"</span>";
}
- writer.println((showStatus ?
StringEscapeUtils.escapeHtml(entry.getStatus().toString()) + " " : "") +
message);
+ writer.println((showStatus ?
StringEscapeUtils.escapeHtml4(entry.getStatus().toString()) + " " : "") +
message);
Exception exception = entry.getException();
if (exception != null) {
- writer.println("<span style='width:20px'/>" +
StringEscapeUtils.escapeHtml(exception.toString()));
+ writer.println("<span style='width:20px'/>" +
StringEscapeUtils.escapeHtml4(exception.toString()));
writer.println("<!--");
exception.printStackTrace(writer);
writer.println("-->");
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/core/impl/servlet/ResultJsonSerializer.java
Fri Apr 29 07:50:27 2016
@@ -21,7 +21,7 @@ import java.io.PrintWriter;
import java.io.StringWriter;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Service;
import org.apache.sling.commons.json.JSONArray;
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/main/java/org/apache/sling/hc/util/HealthCheckMetadata.java
Fri Apr 29 07:50:27 2016
@@ -21,7 +21,7 @@ import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.StringUtils;
import org.apache.sling.hc.api.HealthCheck;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
Modified:
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java?rev=1741562&r1=1741561&r2=1741562&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
(original)
+++
sling/trunk/bundles/extensions/healthcheck/core/src/test/java/org/apache/sling/hc/core/it/U.java
Fri Apr 29 07:50:27 2016
@@ -117,7 +117,7 @@ public class U {
mavenBundle("commons-collections", "commons-collections",
"3.2.1"),
mavenBundle("commons-io", "commons-io", "1.4"),
mavenBundle("commons-fileupload", "commons-fileupload",
"1.2.2"),
- mavenBundle("commons-lang", "commons-lang", "2.5"),
+
mavenBundle().groupId("org.apache.commons").artifactId("commons-lang3").versionAsInProject(),
mavenBundle("org.mortbay.jetty", "servlet-api-2.5",
"6.1.14")
)
);
