You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2018/07/05 09:57:08 UTC
svn commit: r1835116 - in /jackrabbit/oak/branches/1.6/oak-examples/webapp:
./ pom.xml src/test/java/org/apache/jackrabbit/j2ee/TomcatIT.java
Author: reschke
Date: Thu Jul 5 09:57:08 2018
New Revision: 1835116
URL: http://svn.apache.org/viewvc?rev=1835116&view=rev
Log:
OAK-7257: oak-examples: update Tomcate dependency (ported to 1.6) - backed out due to timeouts
Modified:
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/oak-examples/webapp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul 5 09:57:08 2018
@@ -1,3 +1,3 @@
/jackrabbit/branches/JCR-2272/jackrabbit-webapp:1173165-1176545
-/jackrabbit/oak/trunk/oak-examples/webapp:1782990,1785108,1823669,1825561
+/jackrabbit/oak/trunk/oak-examples/webapp:1782990,1785108
/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=1835116&r1=1835115&r2=1835116&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml (original)
+++ jackrabbit/oak/branches/1.6/oak-examples/webapp/pom.xml Thu Jul 5 09:57:08 2018
@@ -35,7 +35,7 @@
<description>Web application that hosts and serves a Jackrabbit Oak content repository</description>
<properties>
- <tomcat.version>7.0.84</tomcat.version>
+ <tomcat.version>7.0.40</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=1835116&r1=1835115&r2=1835116&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 Thu Jul 5 09:57:08 2018
@@ -16,12 +16,9 @@
*/
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;
@@ -37,7 +34,6 @@ 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 {
@@ -62,10 +58,11 @@ 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);
@@ -126,23 +123,6 @@ 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();