Re: [OT] Moving files between projects in svn
2017-09-01 0:42 GMT+03:00 Christopher Schultz : > > Mark, > > On 8/31/17 5:38 PM, Mark Thomas wrote: >> On 31/08/17 22:13, Christopher Schultz wrote: >>> All, >>> >>> I've got a subversion repository with multiple "projects" similar >>> to how ASF has their set up: each project gets a top-level >>> directory, then /trunk, /tags, and /branches below each of those >>> top-levels. >>> >>> I'd like to merge two of my projects together, and I can only >>> see three options: >>> >>> 1. Check out the entire repository and "svn mv" individual >>> files/directories between the projects in the working copy, then >>> do a single commit. >>> >>> 2. Do an "svn mv project-url-A project-url-b/temp" and then move >>> the files around within the working copy of project-url-b to get >>> them where I want them. >>> >>> This will create at least two commits, where the first commit >>> creates a bit of a not-sane state with regard to project-b, but >>> isn't the worst thing that could happen. >>> >>> 3. Do individual "svn mv" operations on each of the files and >>> directories I want to move as URLs (i.e. not using the >>> working-copy). This will create many commits where the state of >>> project-B is potentially broken. >>> >>> Are there any other ways of doing this that I haven't thought of? >>> I'd really like to have a single commit that goes from these >>> projects being separate to them being unified without breaking >>> any builds or doing any "temp" funny business like I have in >>> option 2 above. >> >> 1. but with a sparse checkout so you only checkout the projects you >> want to merge? > > Sounds perfect. Thanks for the pointer. :) +1 For sake of completeness, there is also a tool called "svnmucc", which nowadays is included with standard svn distribution. http://svnbook.red-bean.com/en/1.8/svn.ref.svnmucc.re.html It can perform several move operations in the same commit. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806909 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: markt Date: Fri Sep 1 09:29:15 2017 New Revision: 1806909 URL: http://svn.apache.org/viewvc?rev=1806909&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60900 Avoid a NullPointerException in the APR Poller if a connection is closed at the same time as new data arrives on that connection. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 1 09:29:15 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684
svn commit: r1806911 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml
Author: markt Date: Fri Sep 1 09:31:34 2017 New Revision: 1806911 URL: http://svn.apache.org/viewvc?rev=1806911&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60900 Avoid a NullPointerException in the APR Poller if a connection is closed at the same time as new data arrives on that connection. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 1 09:31:34 2017 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,1802814,180361 8,1806107,1806733 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-17
[Bug 60900] org.apache.tomcat.util.net.AprEndpoint$Poller.run throws java.lang.NullPointerException
https://bz.apache.org/bugzilla/show_bug.cgi?id=60900 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |FIXED --- Comment #8 from Mark Thomas --- I've back-ported the NPE fix to: - 8.0.x for 8.0.47 onwards - 7.0.x for 7.0.82 onwards I didn't back-port the edge case fixes as the refactoring in 8.5.x means the associated code is different (e.g. it has Comet handling) and I didn't want to risk triggering a regression. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806932 - /tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
Author: markt
Date: Fri Sep 1 11:10:37 2017
New Revision: 1806932
URL: http://svn.apache.org/viewvc?rev=1806932&view=rev
Log:
Update comment. We now have features that depend on Java 9.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1806932&r1=1806931&r2=1806932&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Fri Sep 1
11:10:37 2017
@@ -34,10 +34,6 @@ public class JreCompat {
static {
// This is Tomcat 9 with a minimum Java version of Java 8.
-// At this point there are no option features that require Java > 8 but
-// the memory leak detection code does need to know if it is running on
-// Java 9+ since the modularisation changes break some of the
reflection
-// used
// Look for the highest supported JVM first
if (Jre9Compat.isSupported()) {
instance = new Jre9Compat();
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806935 - in /tomcat/site/trunk: docs/conference.html xdocs/conference.xml
Author: markt Date: Fri Sep 1 11:27:11 2017 New Revision: 1806935 URL: http://svn.apache.org/viewvc?rev=1806935&view=rev Log: Minor wording tweak Modified: tomcat/site/trunk/docs/conference.html tomcat/site/trunk/xdocs/conference.xml Modified: tomcat/site/trunk/docs/conference.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/conference.html?rev=1806935&r1=1806934&r2=1806935&view=diff == --- tomcat/site/trunk/docs/conference.html (original) +++ tomcat/site/trunk/docs/conference.html Fri Sep 1 11:27:11 2017 @@ -269,7 +269,7 @@ 08.00 Registration and Breakfast 09.00 Welcome -Introduction and Welcome from our sponsors, Liferay +Introduction and Welcome from our event sponsor, Liferay 09.20 State of the Cat Mark Thomas (markt) Modified: tomcat/site/trunk/xdocs/conference.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/conference.xml?rev=1806935&r1=1806934&r2=1806935&view=diff == --- tomcat/site/trunk/xdocs/conference.xml (original) +++ tomcat/site/trunk/xdocs/conference.xml Fri Sep 1 11:27:11 2017 @@ -40,7 +40,7 @@ 08.00 Registration and Breakfast 09.00 Welcome -Introduction and Welcome from our sponsors, Liferay +Introduction and Welcome from our event sponsor, Liferay 09.20 State of the Cat Mark Thomas (markt) A review of the past year or so for Apache Tomcat and a look forward to what - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806940 - in /tomcat/tc7.0.x/trunk: java/org/apache/naming/resources/FileDirContext.java java/org/apache/naming/resources/LocalStrings.properties java/org/apache/naming/resources/VirtualD
Author: markt
Date: Fri Sep 1 12:11:51 2017
New Revision: 1806940
URL: http://svn.apache.org/viewvc?rev=1806940&view=rev
Log:
Correct regression in 7.0.80 that broke the use of relative paths with the
extraResourcePaths attribute of a VirtualDirContext.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java?rev=1806940&r1=1806939&r2=1806940&view=diff
==
--- tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/FileDirContext.java
Fri Sep 1 12:11:51 2017
@@ -137,7 +137,15 @@ public class FileDirContext extends Base
throw new
IllegalArgumentException(sm.getString("fileResources.base", docBase));
}
-this.absoluteBase = base.getAbsolutePath();
+// absoluteBase also needs to be normalized. Using the canonical path
is
+// the simplest way of doing this.
+try {
+this.absoluteBase = base.getCanonicalPath();
+} catch (IOException e) {
+log.warn(sm.getString("fileResources.canonical.fail",
base.getPath()));
+// Fall back to the absolute path
+this.absoluteBase = base.getAbsolutePath();
+}
super.setDocBase(docBase);
}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties?rev=1806940&r1=1806939&r2=1806940&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/LocalStrings.properties
Fri Sep 1 12:11:51 2017
@@ -14,6 +14,7 @@
# limitations under the License.
fileResources.base=Document base {0} does not exist or is not a readable
directory
+fileResources.canonical.fail=A canonical path could not be determined for [{0}]
fileResources.listingNull=Could not get dir listing for {0}
warResources.notWar=Doc base must point to a WAR file
warResources.invalidWar=Invalid or unreadable WAR file : {0}
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java?rev=1806940&r1=1806939&r2=1806940&view=diff
==
---
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
(original)
+++
tomcat/tc7.0.x/trunk/java/org/apache/naming/resources/VirtualDirContext.java
Fri Sep 1 12:11:51 2017
@@ -17,6 +17,7 @@
package org.apache.naming.resources;
import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -58,6 +59,10 @@ import org.apache.naming.NamingEntry;
* @author Fabrizio Giustina
*/
public class VirtualDirContext extends FileDirContext {
+
+private static final org.apache.juli.logging.Log log=
+org.apache.juli.logging.LogFactory.getLog(VirtualDirContext.class);
+
private String extraResourcePaths = "";
private Map> mappedResourcePaths;
@@ -113,7 +118,13 @@ public class VirtualDirContext extends F
resourcePaths = new ArrayList();
mappedResourcePaths.put(path, resourcePaths);
}
-resourcePaths.add(dir.getAbsolutePath());
+try {
+resourcePaths.add(dir.getCanonicalPath());
+} catch (IOException e) {
+log.warn(sm.getString("fileResources.canonical.fail",
dir.getPath()));
+// Fall back to the absolute path
+resourcePaths.add(dir.getAbsolutePath());
+}
}
}
if (mappedResourcePaths.isEmpty()) {
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1806940&r1=1806939&r2=1806940&view=diff
==
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Fri Sep 1 12:11:51 2017
@@ -64,6 +64,11 @@
61452: Fix a copy paste error that caused an
UnsupportedEncod
Re: [VOTE] Release Apache Tomcat Native 1.2.14
On Tue, Aug 29, 2017 at 8:28 PM, Mark Thomas wrote: > Version 1.2.14 includes the following changes compared to 1.2.12: > > - Update minimum recommended OpenSSL version to 1.0.2l > - Update minimum recommended APR version to 1.6.2 > - Windows binaries built with OpenSSL 1.0.2l and APR 1.6.2 > - Support for the SSL_CONF_cmd API > > Various other fixes and improvements. See the changelog for details. > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.14 is > [X] Stable, go ahead and release > [ ] Broken because of ... > Works well for me. Rémy > > Thanks, > > Mark > > > [1] > https://dist.apache.org/repos/dist/dev/tomcat/tomcat- > connectors/native/1.2.14/ > [2] https://svn.apache.org/repos/asf/tomcat/native/tags/TOMCAT_ > NATIVE_1_2_14 > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Re: [OT] Moving files between projects in svn
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Konstantin, On 9/1/17 5:10 AM, Konstantin Kolinko wrote: > 2017-09-01 0:42 GMT+03:00 Christopher Schultz > : >> >> Mark, >> >> On 8/31/17 5:38 PM, Mark Thomas wrote: >>> On 31/08/17 22:13, Christopher Schultz wrote: All, I've got a subversion repository with multiple "projects" similar to how ASF has their set up: each project gets a top-level directory, then /trunk, /tags, and /branches below each of those top-levels. I'd like to merge two of my projects together, and I can only see three options: 1. Check out the entire repository and "svn mv" individual files/directories between the projects in the working copy, then do a single commit. 2. Do an "svn mv project-url-A project-url-b/temp" and then move the files around within the working copy of project-url-b to get them where I want them. This will create at least two commits, where the first commit creates a bit of a not-sane state with regard to project-b, but isn't the worst thing that could happen. 3. Do individual "svn mv" operations on each of the files and directories I want to move as URLs (i.e. not using the working-copy). This will create many commits where the state of project-B is potentially broken. Are there any other ways of doing this that I haven't thought of? I'd really like to have a single commit that goes from these projects being separate to them being unified without breaking any builds or doing any "temp" funny business like I have in option 2 above. >>> >>> 1. but with a sparse checkout so you only checkout the projects >>> you want to merge? >> >> Sounds perfect. Thanks for the pointer. :) > > +1 > > For sake of completeness, there is also a tool called "svnmucc", > which nowadays is included with standard svn distribution. > > http://svnbook.red-bean.com/en/1.8/svn.ref.svnmucc.re.html > > It can perform several move operations in the same commit. Thanks for the additional reference. In my case, the sparse-checkout made a lot more sense, because I needed to do things like run our test suite on the resulting working copy before I committed anything. But next time I need to "archive" a whole bunch of RCs or really old tags or something, I'll definitely keep svnmucc in mind. - -chris -BEGIN PGP SIGNATURE- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJZqW4rAAoJEBzwKT+lPKRY+R0P/1P2i3X4DcWEzPf7Fq5xwty1 KG4zMJ8Tmc8Ko4bnYneng85o1c5iCU4Yu4WdWEbsSdjHUJVOb292Y4MxzSWDECPB ZC/Z5jIVR551IojasuIdBxsvYoZiThhCWtQYMy/SGoFWlu9k7uIKwvUvjDm2i7F8 TaBjb9stdbQamFqKgjEKRKMImOsV1JgjQH9hpIPOKqobJxPjNn3l+mjLp1BubS50 fT7Vw0XrEmbNOFXHIFSWQsbG6hgp/8E0ERq52srpRlsh1tTsrNdDtWyrDGOvpnyG R52c1DRX5znfMhfl0ms7fAmsNPCdcPCh137zb4ciJkx4s6JjTAuXM386nOvsoATf afPrhGfJXNtjthRV3GsEyUlhTQBKNuFuubXSkyw+yHzvurdWLfqrOQj/3hQgvTxt jDnwvk4MCaB4FAaA4eDs/9vOBRCX+spF9JDhfXr7mvh5UvU9RPsio51ITfP+lWtw ThO1d6gf9RNfCGPc3vQOuph52mXeK2lVxTb6CT1iiTwKWglUM9gxsxlzqepAb52N El82S0/MgSU56KPJKVl7vrc0hwrRoLIuRGQt087li2DwlJ5C1OHRvEmyu54tN1+t 2Lo1Z3lSPlrhSD3BIktMmp0at7cuxAdsx7QMNAIw1N0iPkIpSFkyqtPrwj4Yu8ms yoRz1fktJa8JJaAZ21J6 =K9w9 -END PGP SIGNATURE- - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 58837] support "X-Content-Security-Policy" a.k.a as "CSP"
https://bz.apache.org/bugzilla/show_bug.cgi?id=58837 Christopher Schultz changed: What|Removed |Added Component|Connectors |Catalina --- Comment #5 from Christopher Schultz --- I don't think this is for "Connectors" [mod_jk]. Re-assigning component. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 57946] Configuration example for mod_jk should be updated to follow Apache 2.4 syntax scheme
https://bz.apache.org/bugzilla/show_bug.cgi?id=57946 Christopher Schultz changed: What|Removed |Added Keywords||Beginner -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806966 - /tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Author: markt
Date: Fri Sep 1 14:41:10 2017
New Revision: 1806966
URL: http://svn.apache.org/viewvc?rev=1806966&view=rev
Log:
Simplify.
MalformedURLException is a sub-class of IOException
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1806966&r1=1806965&r2=1806966&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Fri Sep 1 14:41:10 2017
@@ -20,7 +20,6 @@ package org.apache.catalina.core;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.MalformedURLException;
import java.net.URL;
import java.net.URLConnection;
import java.sql.DriverManager;
@@ -299,9 +298,6 @@ public class JreMemoryLeakPreventionList
URL url = new URL("jar:file://dummy.jar!/");
URLConnection uConn = url.openConnection();
uConn.setDefaultUseCaches(false);
-} catch (MalformedURLException e) {
-log.error(sm.getString(
-"jreLeakListener.jarUrlConnCacheFail"), e);
} catch (IOException e) {
log.error(sm.getString(
"jreLeakListener.jarUrlConnCacheFail"), e);
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806967 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Author: markt Date: Fri Sep 1 14:41:58 2017 New Revision: 1806967 URL: http://svn.apache.org/viewvc?rev=1806967&view=rev Log: Simplify. MalformedURLException is a sub-class of IOException Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 1 14:41:58 2017 @@ -1 +1 @@ -/tomcat/trunk:1734785,1734799,1734845,1734928,1735041,1735044,1735480,1735577,1735597,1735599-1735600,1735615,1736145,1736162,1736209,1736280,1736297,1736299,1736489,1736646,1736703,1736836,1736849,1737104-1737105,1737112,1737117,1737119-1737120,1737155,1737157,1737192,1737280,1737339,1737632,1737664,1737715,1737748,1737785,1737834,1737860,1737903,1737959,1738005,1738007,1738014-1738015,1738018,1738022,1738039,1738043,1738059-1738060,1738147,1738149,1738174-1738175,1738261,1738589,1738623-1738625,1738643,1738816,1738850,1738855,1738946-1738948,1738953-1738954,1738979,1738982,1739079-1739081,1739087,1739113,1739153,1739172,1739176,1739191,1739474,1739726,1739762,1739775,1739814,1739817-1739818,1739975,1740131,1740324,1740465,1740495,1740508-1740509,1740520,1740535,1740707,1740803,1740810,1740969,1740980,1740991,1740997,1741015,1741033,1741036,1741058,1741060,1741080,1741147,1741159,1741164,1741173,1741181,1741190,1741197,1741202,1741208,1741213,1741221,1741225,1741232,1741409,1741501 ,1741677,1741892,1741896,1741984,1742023,1742042,1742071,1742090,1742093,1742101,1742105,1742111,1742139,1742146,1742148,1742166,1742181,1742184,1742187,1742246,1742248-1742251,1742263-1742264,1742268,1742276,1742369,1742387,1742448,1742509-1742512,1742917,1742919,1742933,1742975-1742976,1742984,1742986,1743019,1743115,1743117,1743124-1743125,1743134,1743425,1743554,1743679,1743696-1743698,1743700-1743701,1744058,1744064-1744065,1744125,1744194,1744229,1744270,1744323,1744432,1744684,1744697,1744705,1744713,1744760,1744786,1745083,1745142-1745143,1745145,1745177,1745179-1745180,1745227,1745248,1745254,1745337,1745467,1745473,1745535,1745576,1745735,1745744,1746304,1746306-1746307,1746319,1746327,1746338,1746340-1746341,1746344,1746427,1746441,1746473,1746490,1746492,1746495-1746496,1746499-1746501,1746503-1746507,1746509,1746549,1746551,1746554,1746556,1746558,1746584,1746620,1746649,1746724,1746939,1746989,1747014,1747028,1747035,1747210,1747225,1747234,1747253,1747404,1747506,1747 536,1747924,1747980,1747993,1748001,1748253,1748452,1748547,1748629,1748676,1748715,1749287,1749296,1749328,1749373,1749465,1749506,1749508,1749665-1749666,1749763,1749865-1749866,1749898,1749978,1749980,1750011,1750015,1750056,1750480,1750617,1750634,1750692,1750697,1750700,1750703,1750707,1750714,1750718,1750723,1750774,1750899,1750975,1750995,1751061,1751097,1751173,1751438,1751447,1751463,1751702,1752212,1752737,1752745,1753078,1753080,1753358,1753363,1754111,1754140-1754141,1754281,1754310,1754445,1754467,1754494,1754496,1754528,1754532-1754533,1754613,1754714,1754874,1754941,1754944,1754950-1754951,1755005,1755007,1755009,1755132,1755180-1755181,1755185,1755190,1755204-1755206,1755208,1755214,1755224,1755227,1755230,1755629,1755646-1755647,1755650,1755653,1755675,1755680,1755683,1755693,1755717,1755731-1755737,1755812,1755828,1755884,1755890,1755918-1755919,1755942,1755958,1755960,1755970,1755993,1756013,1756019,1756039,1756056,1756083-1756114,1756175,1756288-1756289,1756408-1 756410,1756778,1756798,1756878,1756898,1756939,1757123-1757124,1757126,1757128,1757132-1757133,1757136,1757145,1757167-1757168,1757175,1757180,1757182,1757195,1757271,1757278,1757347,1757353-1757354,1757363,1757374,1757399,1757406,1757408,1757485,1757495,1757499,1757527,1757578,1757684,1757722,1757727,1757790,1757799,1757813,1757853,1757883,1757903,1757976,1757997,1758000,1758058,1758072-1758075,1758078-1758079,1758223,1758257,1758261,1758276,1758292,1758369,1758378-1758383,1758421,1758423,1758425-1758427,1758430,1758443,1758448,1758459,1758483,1758486-1758487,1758499,1758525,1758556,1758580,1758582,1758584,1758588,1758842,1759019,1759212,1759224,1759227,1759252,1759274,1759513-1759516,1759611,1759757,1759785-1759790,1760005,1760022,1760109-1760110,1760135,1760200-1760201,1760227,1760300,1760397,1760446,1760454,1760640,1760648,1761057,1761422,1761491,1761498,1761500-1761501,1761550,1761553,1761572,1761574,1761625-1761626,1761628,1761682,1761740,1761752,1762051-1762053,1762123,176216 8,1762172,1762182,1762201-1762202,1762204,1762208,1762288,1762296,1762324,1762348,1762353,1762362,1762374,1762492,1762503,1762505,1762541,1762608,1762710,1762753,1762766,1762769,1762944,1762947,1762953,1763167,1763179,1763232,1763259,1763271-1763272,1763276-1763277,1763319-1763320,1763370,1763372,1763375,1763377,1763393,1763412,1763430,1763450,1763462,1763505,1763511-1763512,1763516,1763518,1763520,1763529,1763559,1763565,1763568,1763574,1763619,1763634-1763
[Bug 49822] Add hash lb worker method
https://bz.apache.org/bugzilla/show_bug.cgi?id=49822 Christopher Schultz changed: What|Removed |Added Keywords||PatchAvailable --- Comment #2 from Christopher Schultz --- Note the age of the patch. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 43303] Versioning under Windows not reported by many connector components
https://bz.apache.org/bugzilla/show_bug.cgi?id=43303 --- Comment #7 from Christopher Schultz --- Any update on this, Bill? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806968 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Author: markt Date: Fri Sep 1 14:43:13 2017 New Revision: 1806968 URL: http://svn.apache.org/viewvc?rev=1806968&view=rev Log: Simplify. MalformedURLException is a sub-class of IOException Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 1 14:43:13 2017 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792,1772948,1777014,1779719,1782037,1782240,1782386-1782387,1785669,1786845,1788249,1788324,1788905,1789216,1789335,1791528,1791558,1796697-1796698,1797521,1798543,1799162,1800143,1801693,1802805,1806799 -/tomcat/trunk:1636524,1637156,1637176,1637188,1637331,1637684,1637695,1637890,1637892,1638720-1638725,1639653,1640010,1640083-1640084,1640088,1640275,1640322,1640347,1640361,1640365,1640403,1640410,1640652,1640655-1640658,1640688,1640700-1640883,1640903,1640976,1640978,1641000,1641026,1641038-1641039,1641051-1641052,1641058,1641064,1641300,1641369,1641374,1641380,1641486,1641634,1641656-1641692,1641704,1641707-1641718,1641720-1641722,1641735,1641981,1642233,1642280,1642554,1642564,1642595,1642606,1642668,1642679,1642697,1642699,1642766,1643002,1643045,1643054-1643055,1643066,1643121,1643128,1643206,1643209-1643210,1643216,1643249,1643270,1643283,1643309-1643310,1643323,1643365-1643366,1643370-1643371,1643465,1643474,1643536,1643570,1643634,1643649,1643651,1643654,1643675,1643731,1643733-1643734,1643761,1643766,1643814,1643937,1643963,1644017,1644169,1644201-1644203,1644321,1644323,1644516,1644523,1644529,1644535,1644730,1644768,1644784-1644785,1644790,1644793,1644815,1644884,1644886 ,1644890,1644892,1644910,1644924,1644929-1644930,1644935,1644989,1645011,1645247,1645355,1645357-1645358,1645455,1645465,1645469,1645471,1645473,1645475,1645486-1645488,1645626,1645641,1645685,1645743,1645763,1645951-1645953,1645955,1645993,1646098-1646106,1646178,1646220,1646302,1646304,1646420,1646470-1646471,1646476,1646559,1646717-1646723,1646773,1647026,1647042,1647530,1647655,1648304,1648815,1648907,1649973,1650081,1650365,1651116,1651120,1651280,1651470,1652938,1652970,1653041,1653471,1653550,1653574,1653797,1653815-1653816,1653819,1653840,1653857,1653888,1653972,1654013,1654030,1654050,1654123,1654148,1654159,1654513,1654515,1654517,1654522,1654524,1654725,1654735,1654766,1654785,1654851-1654852,1654978,1655122-1655124,1655126-1655127,1655129-1655130,1655132-1655133,1655312,1655351,1655438,1655441,1655454,168,1656087,1656299,1656319,1656331,1656345,1656350,1656590,1656648-1656650,1656657,1657041,1657054,1657374,1657492,1657510,1657565,1657580,1657584,1657586,1657589,1657 592,1657607,1657609,1657682,1657907,1658207,1658734,1658781,1658790,1658799,1658802,1658804,1658833,1658840,1658966,1659043,1659053,1659059,1659174,1659184,1659188-1659189,1659216,1659263,1659293,1659304,1659306-1659307,1659382,1659384,1659428,1659471,1659486,1659505,1659516,1659521,1659524,1659559,1659562,1659803,1659806,1659814,1659833,1659862,1659905,1659919,1659948,1659967,1659983-1659984,1660060,1660074,1660077,1660133,1660168,1660331-1660332,1660353,1660358,1660924,1661386,1661770,1661867,1661972,1661990,1662200,1662308-1662309,1662548,1662614,1662696,1662736,1662985,1662988-1662989,1663264,1663277,1663298,1663534,1663562,1663676,1663715,1663754,1663768,1663772,1663781,1663893,1663995,1664143,1664163,1664174,1664301,1664317,1664347,1664657,1664659,1664710,1664863-1664864,1664866,1665085,1665292,1665559,1665653,1665661,1665672,1665694,1665697,1665736,1665779,1665976-1665977,1665980-1665981,1665985-1665986,1665989,1665998,1666004,1666008,1666013,1666017,1666024,1666116,1666386-1 666387,1666494,1666496,1666552,1666569,1666579,137,149,1666757,1666966,1666972,1666985,1666995,1666997,1667292,1667402,1667406,1667546,1667615,1667630,1667636,1667688,1667764,1667871,1668026,1668135,1668193,1668593,1668596,1668630,1668639,1668843,1669353,1669370,1669451,1669800,1669838,1669876,1669882,1670394,1670433,1670591,1670598-1670600,1670610,1670631,1670719,1670724,1670726,1670730,1670940,1671112,1672272,1672284,1673754,1674294,1675461,1675486,1675594,1675830,1676231,1676250-1676251,1676364,1676381,1676393,1676479,1676525,1676552,1676615,1676630,1676634,1676721,1676926,1676943,1677140,1677802,1678011,1678162,1678174,1678339,1678426-1678427,1678694,1678701,1679534,1679708,1679710,1679716,1680034,1680246,1681056,1681123,1681138,1681280,1681283,1681286,1681450,1681697,1681699,1681701,1681729,1681770,1681779,1681793,1681807,1681837-1681838,1681854,1681862,1681958,1682028,1682033,1682311,1682315,1682317,1682320,1682324,1682330,1682842,1684172,1684366,1684383,1684526-168452 7,1684549-1684550,1685556,1685591,1685739,1685744,1685772,1685816,1685826,1685891,1687242,1687261,1687268,1687340,1687544,
svn commit: r1806969 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Author: markt Date: Fri Sep 1 14:43:49 2017 New Revision: 1806969 URL: http://svn.apache.org/viewvc?rev=1806969&view=rev Log: Simplify. MalformedURLException is a sub-class of IOException Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 1 14:43:49 2017 @@ -1,3 +1,3 @@ /tomcat/tc8.0.x/trunk:1636525,1637336,1637685,1637709,1638726,1640089,1640276,1640349,1640363,1640366,1640642,1640672,1640674,1640689,1640884,1641001,1641065,1641067,1641375,1641638,1641723,1641726,1641729-1641730,1641736,1641988,1642669-1642670,1642698,1642701,1643205,1643215,1643217,1643230,1643232,1643273,1643285,1643329-1643330,1643511,1643513,1643521,1643539,1643571,1643581-1643582,1643635,1643655,1643738,1643964,1644018,1644333,1644525,1644954,1644992,1645014,1645360,1645456,1645627,1645642,1645686,1645903-1645904,1645908-1645909,1645913,1645920,1646458,1646460-1646462,1646735,1646738-1646741,1646744,1646746,1646748-1646755,1646757,1646759-1646760,1647043,1648816,1651420-1651422,1651844,1652926,1652939-1652940,1652973,1653798,1653817,1653841,1654042,1654161,1654736,1654767,1654787,1656592,1659907,1662986,1663265,1663278,1663325,1663535,1663567,1663679,1663997,1664175,1664321,1664872,1665061,1665086,1666027,1666395,1666503,1666506,1666560,1666570,1666581,1666759,1666967,1666988 ,1667553-1667555,1667558,1667617,1667633,1667637,1667747,1667767,1667873,1668028,1668137,1668634,1669432,1669801,1669840,1669895-1669896,1670398,1670435,1670592,1670605-1670607,1670609,1670632,1670720,1670725,1670727,1670731,1671114,1672273,1672285,1673759,1674220,1674295,1675469,1675488,1675595,1675831,1676232,1676367-1676369,1676382,1676394,1676483,1676556,1676635,1678178,1679536,1679988,1680256,1681124,1681182,1681703,1681730,1681840,1681864,1681869,1682010,1682034,1682047,1682052-1682053,1682062,1682064,1682070,1682312,1682325,1682331,1682386,1684367,1684385,1685759,1685774,1685827,1685892,1687341,1688904,1689358,1689657,1689921,1692850,1693093,1693108,1693324,1694060,1694115,1694291,1694427,1694431,1694503,1694549,1694789,1694873,1694881,1695356,1695372,1695823-1695825,1696200,1696281,1696379,1696468,1700608,1700871,1700897,1700978,1701094,1701124,1701608,1701668,1701676,1701766,1701944,1702248,1702252,1702314,1702390,1702723,1702725,1702728,1702730,1702733,1702735,1702737,1702 739,1702742,1702744,1702748,1702751,1702754,1702758,1702760,1702763,1702766,1708779,1708782,1708806,1709314,1709670,1710347,1710442,1710448,1710490,1710574,1710578,1712226,1712229,1712235,1712255,1712618,1712649,1712655,1712860,1712899,1712903,1712906,1712913,1712926,1712975,1713185,1713262,1713287,1713613,1713621,1713872,1713976,1713994,1713998,1714004,1714013,1714059,1714538,1714580,1715189,1715207,1715544,1715549,1715637,1715639-1715645,1715667,1715683,1715866,1715978,1715981,1716216-1716217,1716355,1716414,1716421,1717208-1717209,1717257,1717283,1717288,1717291,1717421,1717517,1717529,1718797,1718840-1718843,1719348,1719357-1719358,1719400,1719491,1719737,1720235,1720396,1720442,1720446,1720450,1720463,1720658-1720660,1720756,1720816,1721813,1721818,1721831,1721861,1721867,1721882,1722523,1722527,1722800,1722926,1722941,1722997,1723130,1723440,1723488,1723890,1724434,1724674,1724792,1724803,1724902,1725128,1725131,1725154,1725167,1725911,1725921,1725929,1725963-1725965,1725970,1 725974,1726171-1726173,1726175,1726179-1726182,1726190-1726191,1726195-1726200,1726203,1726226,1726576,1726630,1726992,1727029,1727037,1727671,1727676,1727900,1728028,1728092,1728439,1728449,1729186,1729362,1731009,1731303,1731867,1731872,1731874,1731876,1731885,1731947,1731955,1731959,1731977,1731984,1732360,1732490,1732672,1732902,1733166,1733603,1733619,1733735,1733752,1733764,1733915,1733941,1733964,1734115,1734133,1734261,1734421,1734531,1736286,1737967,1738173,1738182,1738992,1739039,1739089-1739091,1739294,1739777,1739821,1739981,1740513,1740726,1741019,1741162,1741217,1743647,1743681,1744152,1744272,1746732,1746750,1752739,1754615,1755886,1756018,1759565,1761686,1762173,1762206,1766280,1767507-1767508,1767653,1767656,1769267,1772949,1773521,1773527,1774104,1777015,1777213,1779330,1783151,1784188,1784966,1785670,1786846,1788260,1788999,1789140,1789402,1791529,1791559,1795291,1796906,1797523,1799214,1800998-1800999,1801003,1801007-1801008,1801017,1801020,1802808,1802814,180361 8,1806107,1806733 -/tomcat/tc8.5.x/trunk:1735579,1736839,1737199,1737966,1738042,1738044,1738162,1738165,1738178,1739157,1739173,1739177,1739476,1740132,1740521,1740536,1740804,1740811,1740981,1741165,1741174,1741182,1741191,1741203,1741209,1741226,1741233,1741410,1742277,1743118,1743126,1743139-1743140,1743718,1743722,1743724,1744059,1744127,1744151,1744232,1744377,1744687,1744698,1744706,1745228,1746940,1748548,1748716,1749288,1749375,1749668-1749669,1
[Bug 48513] IIS Quick setup instructions
https://bz.apache.org/bugzilla/show_bug.cgi?id=48513 Christopher Schultz changed: What|Removed |Added Keywords||PatchAvailable --- Comment #2 from Christopher Schultz --- This could probably use an update to Windows.latest and IIS.latest. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 46767] mod_jk to send DECLINED in case no fail-over tomcats available/configured
https://bz.apache.org/bugzilla/show_bug.cgi?id=46767 Christopher Schultz changed: What|Removed |Added URL|http://www.nabble.com/mod_j | |k-to21856049.html#a22200827 | --- Comment #1 from Christopher Schultz --- Remove inaccessible reference URL. What does "return DECLINE" mean? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 59897] Buffer Overflow in FD_SET in nb_connect (jk_connect.c) leading to apache2 crash
https://bz.apache.org/bugzilla/show_bug.cgi?id=59897 Christopher Schultz changed: What|Removed |Added Keywords||PatchAvailable --- Comment #3 from Christopher Schultz --- I think this patch is worth serious consideration and testing. (I feel like we had this conversation elsewhere, too.) -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 61476] New: Allow reset of an individual worker stat value
https://bz.apache.org/bugzilla/show_bug.cgi?id=61476 Bug ID: 61476 Summary: Allow reset of an individual worker stat value Product: Tomcat Connectors Version: unspecified Hardware: All OS: All Status: NEW Severity: enhancement Priority: P2 Component: mod_jk Assignee: dev@tomcat.apache.org Reporter: ch...@christopherschultz.net Target Milestone: --- mod_jk stats worker allows authorized users to "reset" the statistics for a particular worker. For example, errors=0, sessions=0, requests=0, etc. All stats are reset to their initial values (usually 0). It would be nice to be able to reset a specific value and not the others. For example, reset errors=0 but leave request/session counts, byte counters, etc. all at their current values. The current URL for resetting worker stats is: /jk-status?cmd=reset&w=[worker]&sw=[subworker] I suggest adding another optional parameter "s" (for "stat") whose value can be any of: Acc Sess Err CE RE Wr Rd MaxBusy MaxCon Rs (?) LR (?) LE ...or a comma-separated list of any of those values. (These values match the shorthand names for the various mod_jk worker stats). Alternatively, multiple "s" parameters could be processed instead of a single comma-separated list of stats. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806973 - in /tomcat/trunk: java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java java/org/apache/tomcat/util/compat/Jre9Compat.java java/org/apache/tomcat/util/compat/JreCom
Author: markt
Date: Fri Sep 1 15:04:45 2017
New Revision: 1806973
URL: http://svn.apache.org/viewvc?rev=1806973&view=rev
Log:
Java 9 allows us to be more selective with the JRE memory leak protection.
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
tomcat/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1806973&r1=1806972&r2=1806973&view=diff
==
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Fri Sep 1 15:04:45 2017
@@ -20,7 +20,6 @@ package org.apache.catalina.core;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-import java.net.URL;
import java.net.URLConnection;
import java.sql.DriverManager;
import java.util.StringTokenizer;
@@ -288,19 +287,17 @@ public class JreMemoryLeakPreventionList
* - javax.xml.bind.JAXBContext.newInstance()
*
* https://bugs.openjdk.java.net/browse/JDK-8163449
+ *
+ * Java 9 onwards disables caching for JAR URLConnections
+ * Java 8 and earlier disables caching for all URLConnections
*/
// Set the default URL caching policy to not to cache
if (urlCacheProtection) {
try {
-// Doesn't matter that this JAR doesn't exist - just as
-// long as the URL is well-formed
-URL url = new URL("jar:file://dummy.jar!/");
-URLConnection uConn = url.openConnection();
-uConn.setDefaultUseCaches(false);
+
JreCompat.getInstance().disableCachingForJarUrlConnections();
} catch (IOException e) {
-log.error(sm.getString(
-"jreLeakListener.jarUrlConnCacheFail"), e);
+
log.error(sm.getString("jreLeakListener.jarUrlConnCacheFail"), e);
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java?rev=1806973&r1=1806972&r2=1806973&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/compat/Jre9Compat.java Fri Sep 1
15:04:45 2017
@@ -16,8 +16,10 @@
*/
package org.apache.tomcat.util.compat;
+import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
+import java.net.URLConnection;
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
@@ -27,16 +29,19 @@ class Jre9Compat extends JreCompat {
private static final Class inaccessibleObjectExceptionClazz;
private static final Method setApplicationProtocolsMethod;
private static final Method getApplicationProtocolMethod;
+private static final Method setDefaultUseCaches;
static {
Class c1 = null;
Method m2 = null;
Method m3 = null;
+Method m4 = null;
try {
c1 =
Class.forName("java.lang.reflect.InaccessibleObjectException");
m2 = SSLParameters.class.getMethod("setApplicationProtocols",
String[].class);
m3 = SSLEngine.class.getMethod("getApplicationProtocol");
+m4 = URLConnection.class.getMethod("setDefaultUseCaches",
String.class, boolean.class);
} catch (SecurityException | NoSuchMethodException e) {
// Should never happen
} catch (ClassNotFoundException e) {
@@ -45,6 +50,7 @@ class Jre9Compat extends JreCompat {
inaccessibleObjectExceptionClazz = c1;
setApplicationProtocolsMethod = m2;
getApplicationProtocolMethod = m3;
+setDefaultUseCaches = m4;
}
@@ -80,5 +86,15 @@ class Jre9Compat extends JreCompat {
} catch (IllegalAccessException | IllegalArgumentException |
InvocationTargetException e) {
throw new UnsupportedOperationException(e);
}
+}
+
+
+@Override
+public void disableCachingForJarUrlConnections() throws IOException {
+try {
+setDefaultUseCaches.invoke(null, "JAR", Boolean.FALSE);
+} catch (IllegalAccessException | IllegalArgumentEx
[Bug 61394] NIO/NIO2 + OpenSSL renegotiation doesn't send list of CAs to user agent
https://bz.apache.org/bugzilla/show_bug.cgi?id=61394 --- Comment #12 from Mark Thomas --- comment #10 looks like the renegotiation issues that were fixed in 1.2.13. I can't reproduce the issue. I've tested this with 1.2.14 and various combinations and all now behave as expected. Once 1.2.14 is available and Tomcat has been updated to require it, this can be closed. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.14
On 29/08/17 19:28, Mark Thomas wrote: > Version 1.2.14 includes the following changes compared to 1.2.12: > > - Update minimum recommended OpenSSL version to 1.0.2l > - Update minimum recommended APR version to 1.6.2 > - Windows binaries built with OpenSSL 1.0.2l and APR 1.6.2 > - Support for the SSL_CONF_cmd API > > Various other fixes and improvements. See the changelog for details. > > The proposed release artefacts can be found at [1], > and the build was done using tag [2]. > > The Apache Tomcat Native 1.2.14 is > [X] Stable, go ahead and release > [ ] Broken because of ... Ran 9.0.x APR/native unit tests with 1.2.14 on Windows, Linux and OSX. All tests passed with the exception of expected failures related to the OpenSSL version being used (the cipher tests are VERY version specific). Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1806994 - in /tomcat/native/trunk: build.properties.default native/include/tcn_version.h native/os/win32/libtcnative.rc
Author: markt
Date: Fri Sep 1 17:23:04 2017
New Revision: 1806994
URL: http://svn.apache.org/viewvc?rev=1806994&view=rev
Log:
Increment version for next development cycle
Modified:
tomcat/native/trunk/build.properties.default
tomcat/native/trunk/native/include/tcn_version.h
tomcat/native/trunk/native/os/win32/libtcnative.rc
Modified: tomcat/native/trunk/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/build.properties.default?rev=1806994&r1=1806993&r2=1806994&view=diff
==
--- tomcat/native/trunk/build.properties.default (original)
+++ tomcat/native/trunk/build.properties.default Fri Sep 1 17:23:04 2017
@@ -18,7 +18,7 @@
# - Version Control Flags -
version.major=1
version.minor=2
-version.build=14
+version.build=15
version.patch=0
version.suffix=-dev
Modified: tomcat/native/trunk/native/include/tcn_version.h
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/include/tcn_version.h?rev=1806994&r1=1806993&r2=1806994&view=diff
==
--- tomcat/native/trunk/native/include/tcn_version.h (original)
+++ tomcat/native/trunk/native/include/tcn_version.h Fri Sep 1 17:23:04 2017
@@ -63,7 +63,7 @@ extern "C" {
#define TCN_MINOR_VERSION 2
/** patch level */
-#define TCN_PATCH_VERSION 14
+#define TCN_PATCH_VERSION 15
/**
* This symbol is defined for internal, "development" copies of TCN. This
Modified: tomcat/native/trunk/native/os/win32/libtcnative.rc
URL:
http://svn.apache.org/viewvc/tomcat/native/trunk/native/os/win32/libtcnative.rc?rev=1806994&r1=1806993&r2=1806994&view=diff
==
--- tomcat/native/trunk/native/os/win32/libtcnative.rc (original)
+++ tomcat/native/trunk/native/os/win32/libtcnative.rc Fri Sep 1 17:23:04 2017
@@ -20,7 +20,7 @@ LANGUAGE 0x9,0x1
"See the License for the specific language governing " \
"permissions and limitations under the License."
-#define TCN_VERSION "1.2.14"
+#define TCN_VERSION "1.2.15"
1000 ICON "apache.ico"
1001 DIALOGEX 0, 0, 252, 51
@@ -36,8 +36,8 @@ BEGIN
END
1 VERSIONINFO
- FILEVERSION 1,2,14,0
- PRODUCTVERSION 1,2,14,0
+ FILEVERSION 1,2,15,0
+ PRODUCTVERSION 1,2,15,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [VOTE] Release Apache Tomcat Native 1.2.14
Am 29.08.2017 um 20:28 schrieb Mark Thomas: Version 1.2.14 includes the following changes compared to 1.2.12: - Update minimum recommended OpenSSL version to 1.0.2l - Update minimum recommended APR version to 1.6.2 - Windows binaries built with OpenSSL 1.0.2l and APR 1.6.2 - Support for the SSL_CONF_cmd API Various other fixes and improvements. See the changelog for details. The proposed release artefacts can be found at [1], and the build was done using tag [2]. The Apache Tomcat Native 1.2.14 is [X] Stable, go ahead and release [ ] Broken because of ... +1 to release, thanks for RMing. - Tested with various combinations of APR 1.6.2 (mostly) and 1.5.2 (a few), OpenSSL 1.0.2l plus patches (mostly), 1.1.0f (some) and 1.1.1 snapshot (some) running unit tests of TC trunk, 8.5. 8.0 and 7.0 - Platforms Solaris 10 Sparc, RHEL 10 32 Bit and 64 Bit, SLES 11 and 12 64 Bit, RHEL 6 and 7 64 Bits - configure flag "--enable-maintainer-mode" - make with gcc 7.1.0 on Solaris and platform gcc on Linux - Using Java versions 1.8.0_121/1.8.0_72, 1.7.0_80 and 1.6.0_45 - Using "-XX:-UseCompressedClassPointers" in combination with - Using "-XX:-UseCompressedClassPointers" in combination with Java 8 on 64 Bit Linux - Using 64 Bit on Solaris for Java 8, 32 Bit for 7 and 6 - SHA1 and MD5 OK - signatures OK - gz and zip for sources consistent - source dist consistent with svn tag - config.guess and config.sub from apr 1.6.2 (copied by buildconf) from this year (OK). - VERSIONS says OpenSSL 1.0.2l and APR 1.6.2 - recreated release with jnirelease script, results are consistent with source dist, except for minor expected diffs in CHANGELOG.txt and generated docs - make succeeds and builds lib - no C warnings - unit test results for TC - some failures but as far as I can see all due to either resource shortages on some old VMs, OpenSSL version specific tests, DH restrictions with Java 6 and sporadic failures in tests unrelated to tcnative Regards, Rainer - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1807004 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/catalina/authenticator/ webapps/docs/ webapps/docs/config/
Author: markt
Date: Fri Sep 1 19:51:42 2017
New Revision: 1807004
URL: http://svn.apache.org/viewvc?rev=1807004&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61280
Add RFC 7617 support to the BasicAuthenticator
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
tomcat/trunk/java/org/apache/catalina/authenticator/LocalStrings.properties
tomcat/trunk/test/org/apache/catalina/authenticator/TestBasicAuthParser.java
tomcat/trunk/webapps/docs/changelog.xml
tomcat/trunk/webapps/docs/config/valve.xml
Modified:
tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java?rev=1807004&r1=1807003&r2=1807004&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/authenticator/BasicAuthenticator.java
Fri Sep 1 19:51:42 2017
@@ -20,6 +20,7 @@ package org.apache.catalina.authenticato
import java.io.IOException;
+import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
import java.security.Principal;
@@ -43,10 +44,30 @@ import org.apache.tomcat.util.codec.bina
* @author Craig R. McClanahan
*/
public class BasicAuthenticator extends AuthenticatorBase {
+
private static final Log log = LogFactory.getLog(BasicAuthenticator.class);
+private Charset charset = StandardCharsets.UTF_8;
+private String charsetString = "UTF-8";
+
+
+public String getCharset() {
+return charsetString;
+}
+
+
+public void setCharset(String charsetString) {
+// Only acceptable options are null, "" or "UTF-8" (case insensitive)
+if (charsetString == null || charsetString.isEmpty()) {
+charset = StandardCharsets.ISO_8859_1;
+} else if ("UTF-8".equalsIgnoreCase(charsetString)) {
+charset = StandardCharsets.UTF_8;
+} else {
+throw new
IllegalArgumentException(sm.getString("basicAuthenticator.invalidCharset"));
+}
+this.charsetString = charsetString;
+}
-// - Public Methods
@Override
protected boolean doAuthenticate(Request request, HttpServletResponse
response)
@@ -66,7 +87,7 @@ public class BasicAuthenticator extends
ByteChunk authorizationBC = authorization.getByteChunk();
BasicCredentials credentials = null;
try {
-credentials = new BasicCredentials(authorizationBC);
+credentials = new BasicCredentials(authorizationBC, charset);
String username = credentials.getUsername();
String password = credentials.getPassword();
@@ -89,6 +110,10 @@ public class BasicAuthenticator extends
value.append("Basic realm=\"");
value.append(getRealmName(context));
value.append('\"');
+if (charsetString != null && !charsetString.isEmpty()) {
+value.append(", charset=");
+value.append(charsetString);
+}
response.setHeader(AUTH_HEADER_NAME, value.toString());
response.sendError(HttpServletResponse.SC_UNAUTHORIZED);
return false;
@@ -112,28 +137,31 @@ public class BasicAuthenticator extends
// note: we include single white space as its delimiter
private static final String METHOD = "basic ";
-private ByteChunk authorization;
-private int initialOffset;
+private final Charset charset;
+private final ByteChunk authorization;
+private final int initialOffset;
private int base64blobOffset;
private int base64blobLength;
private String username = null;
private String password = null;
-
/**
* Parse the HTTP Authorization header for BASIC authentication
* as per RFC 2617 section 2, and the Base64 encoded credentials
* as per RFC 2045 section 6.8.
*
- * @param input The header value to parse in-place
+ * @param input The header value to parse in-place
+ * @param charset The character set to use to convert the bytes to a
+ *string
*
* @throws IllegalArgumentException If the header does not conform
* to RFC 2617
*/
-public BasicCredentials(ByteChunk input)
-throws IllegalArgumentException {
+public BasicCredentials(ByteChunk input, Charset charset) throws
IllegalArgumentException {
authorization = input;
initialOffset = input.getOffset();
+this.charset = charset;
+
parseMethod();
byte[] decoded = parseBase64();
parseCredenti
Re: svn commit: r1807004 - in /tomcat/trunk: java/org/apache/catalina/authenticator/ test/org/apache/catalina/authenticator/ webapps/docs/ webapps/docs/config/
On 01/09/17 20:51, ma...@apache.org wrote: > Author: markt > Date: Fri Sep 1 19:51:42 2017 > New Revision: 1807004 > > URL: http://svn.apache.org/viewvc?rev=1807004&view=rev > Log: > Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=61280 > Add RFC 7617 support to the BasicAuthenticator I'd like to back-port this but before I do I wanted to get some feedback on the default. The options are: a) UTF-8 (the default for 9.0.x) b) "" or null (the current behaviour) The advantage of a) is that we'll support i18n user names and passwords out of the box (assuming the browser does). The disadvantage of a) is that we'll break authentication for any user name or password using ISO-8859-1 characters in the 128-255 range where the browser uses ISO-8859-1 by default and doesn't support RFC 7617. A quick test suggests that this varies between browsers. Chrome appears to use UTF-8 by default. I can't tell if Chrome supports RFC 7617 since it always uses UTF-8. Firefox appears to use ISO-8859-1 by default. It also appears that Firefox doesn't support RFC 7617. IE is the same as Firefox. Hmm. This is a lot messier than I thought it would be. Given what I have observed, there is no combination I can see that will allow BASIC auth to work with a user name or password that contains non ASCII characters with both IE, Firefox and Chrome. Thoughts? Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
