You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2018/06/12 03:54:25 UTC
svn commit: r1833372 - in /jackrabbit/branches/2.8: ./
jackrabbit-webapp/pom.xml
jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Author: reschke
Date: Tue Jun 12 03:54:24 2018
New Revision: 1833372
URL: http://svn.apache.org/viewvc?rev=1833372&view=rev
Log:
JCR-4242: Build failure: unapproved license (ported to 2.8)
Modified:
jackrabbit/branches/2.8/ (props changed)
jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml
jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Propchange: jackrabbit/branches/2.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 12 03:54:24 2018
@@ -2,4 +2,4 @@
/jackrabbit/branches/2.14:1813154
/jackrabbit/branches/JCR-2272:1173165-1176545
/jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1818586,1819269,1821597,1822947,1822950,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1592881,1597717,1597799,1597806,1598035,1598058,1603769,1603934,1609712,1615997,1625561,1627529,1634584,1653275,1667787,1674859,1680757,1709811,1717599,1729382,1730696,1732436,1740814-1740815,1751279,1752165,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775657,1779166,1779460,1780208,1786325,1787043,1787381,1792193,1793315,1793323,1793327,1793332,1796980,1797209,1797917,1798586,1799429,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1810108,1811667,1812994,1814831,1817097-1817098,1817100,1818586,1819269,1820133,1821597,1822947,1822950,1826230,1826647,1826940,1826964
Modified: jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml?rev=1833372&r1=1833371&r2=1833372&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.8/jackrabbit-webapp/pom.xml Tue Jun 12 03:54:24 2018
@@ -212,9 +212,12 @@
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<configuration>
- <systemPropertyVariables>
- <derby.stream.error.file>target/derby.log</derby.stream.error.file>
- </systemPropertyVariables>
+ <systemProperties>
+ <property>
+ <name>derby.stream.error.file</name>
+ <value>target/derby.log</value>
+ </property>
+ </systemProperties>
<excludes>
<exclude>**/BackwardsCompatibilityIT.java</exclude> <!-- JCR-3640 -->
</excludes>
Modified: jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java?rev=1833372&r1=1833371&r2=1833372&view=diff
==============================================================================
--- jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java (original)
+++ jackrabbit/branches/2.8/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java Tue Jun 12 03:54:24 2018
@@ -16,9 +16,12 @@
*/
package org.apache.jackrabbit.j2ee;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
import junit.framework.TestCase;
@@ -31,6 +34,7 @@ import com.gargoylesoftware.htmlunit.htm
import com.gargoylesoftware.htmlunit.html.HtmlForm;
import com.gargoylesoftware.htmlunit.html.HtmlInput;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.google.common.io.Files;
public class TomcatIT extends TestCase {
@@ -53,11 +57,10 @@ public class TomcatIT extends TestCase {
}
}
assertNotNull(war);
+ rewriteWebXml(war);
File bootstrap = new File("target", "bootstrap.properties");
bootstrap.delete();
- RepositoryAccessServlet.bootstrapOverride = bootstrap.getPath();
- RepositoryStartupServlet.bootstrapOverride = bootstrap.getPath();
File baseDir = new File("target", "tomcat");
FileUtils.deleteQuietly(baseDir);
@@ -108,6 +111,23 @@ public class TomcatIT extends TestCase {
return null;
}
+ private void rewriteWebXml(File war) throws IOException {
+ File webXml = new File(war, new File("WEB-INF","web.xml").getPath());
+ assertTrue(webXml.exists());
+ List<String> lines = Files.readLines(webXml, StandardCharsets.UTF_8);
+ BufferedWriter writer = Files.newWriter(webXml, StandardCharsets.UTF_8);
+ try {
+ for (String line : lines) {
+ line = line.replace("<param-value>jackrabbit/bootstrap.properties</param-value>",
+ "<param-value>target/bootstrap.properties</param-value>");
+ writer.write(line);
+ writer.write(System.lineSeparator());
+ }
+ } finally {
+ writer.close();
+ }
+ }
+
protected void tearDown() throws Exception {
client.closeAllWindows();