jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1831521 - in /jackrabbit/branches/2.10: ./ jackrabbit-webapp/pom.xml jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Date Sun, 13 May 2018 14:27:45 GMT
Author: reschke
Date: Sun May 13 14:27:45 2018
New Revision: 1831521

URL: http://svn.apache.org/viewvc?rev=1831521&view=rev
Log:
JCR-4242: Build failure: unapproved license (ported to 2.10)


Modified:
    jackrabbit/branches/2.10/   (props changed)
    jackrabbit/branches/2.10/jackrabbit-webapp/pom.xml
    jackrabbit/branches/2.10/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java

Propchange: jackrabbit/branches/2.10/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun May 13 14:27:45 2018
@@ -1,4 +1,4 @@
 /jackrabbit/branches/2.12:1776442,1776451,1776500,1776524
 /jackrabbit/branches/JCR-2272:1173165-1176545
 /jackrabbit/sandbox/JCR-2415-lucene-3.0:1060860-1064038
-/jackrabbit/trunk:1709811,1717599,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,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,1826230,1826647,1826940,1826964
+/jackrabbit/trunk:1709811,1717599,1729382,1732436,1740814-1740815,1751279,1752165,1753226,1757322,1758600,1759607,1759782,1759865,1761679,1761909,1762422,1763558,1766398,1771078,1771741,1771939,1771999,1772049,1772343,1772444,1772457,1772530,1772544,1773579,1773591,1773745,1774443,1775123,1775132,1775315,1775384,1775414,1775419,1775437,1775444,1775463,1775472-1775473,1775481,1775485,1775496,1775509,1775514,1775613,1775617,1775621,1775624,1775629,1775631-1775632,1775634-1775635,1775637,1775657,1776410,1776414,1776416-1776417,1776421,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,1826230,1826647,1826940,1826964

Modified: jackrabbit/branches/2.10/jackrabbit-webapp/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-webapp/pom.xml?rev=1831521&r1=1831520&r2=1831521&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-webapp/pom.xml (original)
+++ jackrabbit/branches/2.10/jackrabbit-webapp/pom.xml Sun May 13 14:27:45 2018
@@ -217,9 +217,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.10/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.10/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java?rev=1831521&r1=1831520&r2=1831521&view=diff
==============================================================================
--- jackrabbit/branches/2.10/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
(original)
+++ jackrabbit/branches/2.10/jackrabbit-webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Sun May 13 14:27:45 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();
 



Mime
View raw message