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 2021/02/08 12:49:28 UTC
svn commit: r1886320 - in /jackrabbit/branches/2.14/jackrabbit-standalone:
./ src/main/java/org/apache/jackrabbit/standalone/Main.java
Author: reschke
Date: Mon Feb 8 12:49:27 2021
New Revision: 1886320
URL: http://svn.apache.org/viewvc?rev=1886320&view=rev
Log:
JCR-4537: MalformedURLException: Nested JAR URLs are not supported (merged r1879143 into 2.14)
Modified:
jackrabbit/branches/2.14/jackrabbit-standalone/ (props changed)
jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
Propchange: jackrabbit/branches/2.14/jackrabbit-standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Feb 8 12:49:27 2021
@@ -0,0 +1,4 @@
+/jackrabbit/branches/JCR-2272/jackrabbit-standalone:1173165-1176545
+/jackrabbit/sandbox/JCR-2415-lucene-3.0/jackrabbit-standalone:1060860-1064038
+/jackrabbit/trunk/jackrabbit-standalone:1776907,1776911-1776912,1776914,1776918,1779166,1779460,1779614,1779632,1780208,1780220,1780335-1780336,1780406,1785225,1786325,1786330,1787043,1787381,1792066,1792100,1792105,1792113,1792193,1793315,1793323,1793327,1793332,1793339,1796980,1797209,1797215,1797917,1798586,1799429,1799538,1799549,1799575,1800359,1800378,1800752,1802925,1802977,1807234,1807244,1808752,1808754,1809149,1809329,1809624,1810108,1811667,1812543,1812634,1812994,1814831,1817094,1817097-1817098,1817100,1817113,1817201,1817213,1817373,1817377,1818586,1819269,1819271,1819839,1819849,1820119,1820133,1820294,1820573,1820675,1820753,1821247,1821475,1821597,1821705,1821880,1822643,1822863,1822947,1822950,1824756,1824763-1824764,1824771,1824876,1826178,1826230,1826647,1826940,1826964,1828213,1830107,1830201,1830540,1830753,1830814,1830878,1830951,1831854,1831860,1832058,1832090,1833374,1833835,1833891,1834008,1834308,1834315,1834401,1834418,1834424,1834673,1834922,1835445,18354
48,1835459,1836341,1836349,1836620,1836729,1836731,1836733,1836773,1836776,1836778,1836794,1836800,1839647,1839910,1839924,1839931,1839937,1839945,1839964,1839966,1840027,1841858,1841865,1841924,1843995,1844000,1844014,1844036,1844067,1844252,1846665,1846896,1847167,1851360,1851369,1851372,1851904,1851946,1851953,1851961,1852417,1853927,1854018,1856855,1856969,1857631,1857721,1859563,1859633,1860118,1860645,1861773,1861777-1861778,1861781,1861786,1862283,1862783,1862805,1863196,1863222,1863384,1865748,1866234,1866448,1866728,1867128,1867130,1867133,1867170,1867632,1869737,1869788,1869790-1869791,1869793,1870439-1870440,1870442,1870448,1870830,1870948,1871059,1872768,1872992,1873846,1873852,1874367,1875995,1876931,1877355,1878185,1879260,1879635,1880146,1880149
+/jackrabbit/trunk/jackrabbit-standalone-components:1879143
Modified: jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java?rev=1886320&r1=1886319&r2=1886320&view=diff
==============================================================================
--- jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java (original)
+++ jackrabbit/branches/2.14/jackrabbit-standalone/src/main/java/org/apache/jackrabbit/standalone/Main.java Mon Feb 8 12:49:27 2021
@@ -246,7 +246,7 @@ public class Main {
private void prepareWebapp(File file, File repository, File tmp) {
webapp.setContextPath("/");
webapp.setWar(file.getPath());
- webapp.setExtractWAR(false);
+ webapp.setExtractWAR(true);
webapp.setTempDirectory(tmp);
ServletHolder servlet =