Author: reschke
Date: Wed Jul 4 16:51:09 2018
New Revision: 1835068
URL: http://svn.apache.org/viewvc?rev=1835068&view=rev
Log:
OAK-7257: oak-examples: update Tomcate dependency (ported to 1.6)
Modified:
jackrabbit/oak/branches/1.6/ (props changed)
jackrabbit/oak/branches/1.6/oak-examples/webapp/ (props changed)
jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml
jackrabbit/oak/branches/1.6/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Propchange: jackrabbit/oak/branches/1.6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 4 16:51:09 2018
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262
,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1821847,1822850,1823172,1825471,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748,1831374,1832379,1832535,1833308,1834648-1834649
+/jackrabbit/oak/trunk:1781068,1781075,1781248,1781386,1781846,1781907,1782000,1782029,1782196,1782447,1782476,1782770,1782945,1782966,1782973,1782990,1783061,1783066,1783089,1783104-1783105,1783110,1783619,1783720,1783731,1783733,1783738,1783742,1783773,1783855,1783891,1784023,1784034,1784130,1784162,1784251,1784401,1784551,1784574,1784689,1785095,1785108,1785283,1785652,1785838,1785917,1785919,1785946,1786122,1787074,1787145,1787151,1787217,1787425,1788056,1788378,1788387-1788389,1788463,1788476,1788850,1789056,1789534,1789925,1789940,1789987,1790006,1790013,1790069,1790077,1790079,1790382,1790502-1790503,1792049,1792463,1792742,1792746,1793013,1793088,1793618,1793627,1793644,1794393,1794417,1794683,1795138,1795314,1795330,1795475,1795488,1795491,1795502,1795594,1795613,1795618,1796144,1796230,1796239,1796274,1796278,1796988,1797378,1798035,1798832,1798834,1799219,1799389,1799393,1799924,1800244,1800269,1800606,1800613,1800974,1801011,1801013,1801118-1801119,1801675,1802260,1802262
,1802286,1802548,1802905,1802934,1802938,1802973,1803026,1803247-1803249,1803951,1803953-1803955,1804437,1805851-1805852,1806668,1807308,1807688,1808022,1808125,1808128,1808142,1808240,1808246,1809024,1809026,1809131,1809163,1809253,1809255-1809256,1809289,1809745,1811071-1811072,1811155,1811380,1811655,1811952,1811963,1811986,1813192,1814189,1814332,1814397,1815201,1815438,1815926,1817326,1817919,1817987-1817988,1817990,1818038,1818042,1818056,1818124,1818554,1818576,1818645,1819048,1819050,1821325,1821358,1821495,1821516,1821847,1822850,1823172,1823669,1825471,1825561,1826237,1826338,1826532,1826640,1826932,1826957,1827472,1827486,1827977,1829569,1829987,1830019,1830160,1830748,1831374,1832379,1832535,1833308,1834648-1834649
/jackrabbit/trunk:1345480
Propchange: jackrabbit/oak/branches/1.6/oak-examples/webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 4 16:51:09 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272/jackrabbit-webapp:1173165-1176545
-/jackrabbit/oak/trunk/oak-examples/webapp:1782990,1785108
+/jackrabbit/oak/trunk/oak-examples/webapp:1782990,1785108,1823669,1825561
/jackrabbit/sandbox/JCR-2415-lucene-3.0/jackrabbit-webapp:1060860-1064038
Modified: jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml?rev=1835068&r1=1835067&r2=1835068&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml Wed Jul 4 16:51:09
2018
@@ -35,7 +35,7 @@
<description>Web application that hosts and serves a Jackrabbit Oak content
repository</description>
<properties>
- <tomcat.version>7.0.40</tomcat.version>
+ <tomcat.version>7.0.84</tomcat.version>
<tika.version>1.7</tika.version>
<skip.deployment>true</skip.deployment>
</properties>
Modified:
jackrabbit/oak/branches/1.6/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.6/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java?rev=1835068&r1=1835067&r2=1835068&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.6/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
(original)
+++
jackrabbit/oak/branches/1.6/oak-examples/webapp/src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Wed Jul 4 16:51:09 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;
@@ -34,6 +37,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 {
@@ -58,11 +62,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);
@@ -123,6 +126,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>oak/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.close();
