svn commit: r1771257 - in /tomcat/trunk: java/org/apache/catalina/Cluster.java java/org/apache/catalina/Pipeline.java java/org/apache/catalina/Realm.java java/org/apache/catalina/core/StandardPipeline
Author: markt
Date: Fri Nov 25 09:00:14 2016
New Revision: 1771257
URL: http://svn.apache.org/viewvc?rev=1771257&view=rev
Log:
Refactor Catalina interfaces to make wider use of the Contained interface and
reduce duplication.
Modified:
tomcat/trunk/java/org/apache/catalina/Cluster.java
tomcat/trunk/java/org/apache/catalina/Pipeline.java
tomcat/trunk/java/org/apache/catalina/Realm.java
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/Cluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Cluster.java?rev=1771257&r1=1771256&r2=1771257&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Cluster.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Cluster.java Fri Nov 25 09:00:14 2016
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina;
/**
@@ -29,9 +28,7 @@ package org.apache.catalina;
* @author Bip Thelin
* @author Remy Maucherat
*/
-public interface Cluster {
-
-// - Properties
+public interface Cluster extends Contained {
/**
* Return the name of the cluster that this Server is currently
@@ -41,6 +38,7 @@ public interface Cluster {
*/
public String getClusterName();
+
/**
* Set the name of the cluster to join, if no cluster with
* this name is present create one.
@@ -49,22 +47,6 @@ public interface Cluster {
*/
public void setClusterName(String clusterName);
-/**
- * Set the Container associated with our Cluster
- *
- * @param container The Container to use
- */
-public void setContainer(Container container);
-
-/**
- * Get the Container associated with our Cluster
- *
- * @return The Container associated with our Cluster
- */
-public Container getContainer();
-
-
-// - Public Methods
/**
* Create a new manager which will use this cluster to replicate its
@@ -77,6 +59,7 @@ public interface Cluster {
*/
public Manager createManager(String name);
+
/**
* Register a manager with the cluster. If the cluster is not responsible
* for creating a manager, then the container will at least notify the
@@ -85,14 +68,13 @@ public interface Cluster {
*/
public void registerManager(Manager manager);
+
/**
* Removes a manager from the cluster
* @param manager Manager
*/
public void removeManager(Manager manager);
-// - Cluster Wide
Deployments
-
/**
* Execute a periodic task, such as reloading, etc. This method will be
Modified: tomcat/trunk/java/org/apache/catalina/Pipeline.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/Pipeline.java?rev=1771257&r1=1771256&r2=1771257&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/Pipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/Pipeline.java Fri Nov 25 09:00:14 2016
@@ -14,11 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
-
package org.apache.catalina;
-
/**
* Interface describing a collection of Valves that should be executed
* in sequence when the invoke() method is invoked. It is
@@ -37,11 +34,7 @@ package org.apache.catalina;
* @author Craig R. McClanahan
* @author Peter Donald
*/
-public interface Pipeline {
-
-
-// - Properties
-
+public interface Pipeline extends Contained {
/**
* @return the Valve instance that has been distinguished as the basic
@@ -65,9 +58,6 @@ public interface Pipeline {
public void setBasic(Valve valve);
-// - Public Methods
-
-
/**
* Add a new Valve to the end of the pipeline associated with this
* Container. Prior to adding the Valve, the Valve's
@@ -123,24 +113,10 @@ public interface Pipeline {
*/
public Valve getFirst();
+
/**
* Returns true if all the valves in this pipeline support async, false
otherwise
* @return true if all the valves in this pipeline support async, false
otherwise
*/
public boolean isAsyncSupported();
-
-
-/**
- * @return the Container with which this Pipeline is associated.
- */
-public Container getContainer();
-
-
-/**
- * Set the Container with which this Pipeline is associated.
- *
- * @param container The new associated container
- */
[Bug 60381] Inconsistent toString() in ValveBase and RealmBase
https://bz.apache.org/bugzilla/show_bug.cgi?id=60381 --- Comment #5 from Michael Osipov <1983-01...@gmx.net> --- I see that you have picked up my proposal to reuse the Contained interface: http://www.mail-archive.com/dev@tomcat.apache.org/msg113336.html -- 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: r1771263 - in /tomcat/trunk: java/org/apache/catalina/core/ java/org/apache/catalina/ha/tcp/ java/org/apache/catalina/loader/ java/org/apache/catalina/realm/ java/org/apache/catalina/sessi
Author: markt
Date: Fri Nov 25 09:35:20 2016
New Revision: 1771263
URL: http://svn.apache.org/viewvc?rev=1771263&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60381
Provide a standard toString() implementation for components that implement
Contained.
Added:
tomcat/trunk/java/org/apache/catalina/util/ToStringUtil.java (with props)
Modified:
tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/session/ManagerBase.java
tomcat/trunk/java/org/apache/catalina/session/StoreBase.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/java/org/apache/catalina/valves/ValveBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java?rev=1771263&r1=1771262&r2=1771263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java (original)
+++ tomcat/trunk/java/org/apache/catalina/core/StandardPipeline.java Fri Nov 25
09:35:20 2016
@@ -32,6 +32,7 @@ import org.apache.catalina.LifecycleStat
import org.apache.catalina.Pipeline;
import org.apache.catalina.Valve;
import org.apache.catalina.util.LifecycleBase;
+import org.apache.catalina.util.ToStringUtil;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -213,10 +214,7 @@ public class StandardPipeline extends Li
*/
@Override
public String toString() {
-StringBuilder sb = new StringBuilder("Pipeline[");
-sb.append(container);
-sb.append(']');
-return sb.toString();
+return ToStringUtil.toString(this);
}
Modified: tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?rev=1771263&r1=1771262&r2=1771263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java Fri Nov
25 09:35:20 2016
@@ -55,6 +55,7 @@ import org.apache.catalina.tribes.group.
import
org.apache.catalina.tribes.group.interceptors.MessageDispatchInterceptor;
import org.apache.catalina.tribes.group.interceptors.TcpFailureDetector;
import org.apache.catalina.util.LifecycleMBeanBase;
+import org.apache.catalina.util.ToStringUtil;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
@@ -639,15 +640,7 @@ public class SimpleTcpCluster extends Li
*/
@Override
public String toString() {
-StringBuilder sb = new StringBuilder(this.getClass().getName());
-sb.append('[');
-if (container == null) {
-sb.append("Container is null");
-} else {
-sb.append(container.getName());
-}
-sb.append(']');
-return sb.toString();
+return ToStringUtil.toString(this);
}
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java?rev=1771263&r1=1771262&r2=1771263&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java (original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappLoader.java Fri Nov 25
09:35:20 2016
@@ -38,6 +38,7 @@ import org.apache.catalina.LifecycleExce
import org.apache.catalina.LifecycleState;
import org.apache.catalina.Loader;
import org.apache.catalina.util.LifecycleMBeanBase;
+import org.apache.catalina.util.ToStringUtil;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.ExceptionUtils;
@@ -360,11 +361,7 @@ public class WebappLoader extends Lifecy
*/
@Override
public String toString() {
-StringBuilder sb = new StringBuilder("WebappLoader[");
-if (context != null)
-sb.append(context.getName());
-sb.append("]");
-return (sb.toString());
+return ToStringUtil.toString(this, context);
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1771263&r1=1771262&r2=1771263&view=diff
svn commit: r1771266 - in /tomcat/trunk: java/org/apache/catalina/realm/ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/
Author: markt
Date: Fri Nov 25 09:41:40 2016
New Revision: 1771266
URL: http://svn.apache.org/viewvc?rev=1771266&view=rev
Log:
Deprecate RealmBase.getName()
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/NullRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=1771266&r1=1771265&r2=1771266&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Fri Nov 25
09:41:40 2016
@@ -52,7 +52,9 @@ public class CombinedRealm extends Realm
/**
* Descriptive information about this Realm implementation.
+ * @deprecated This will be removed in Tomcat 9 onwards.
*/
+@Deprecated
protected static final String name = "CombinedRealm";
/**
@@ -392,6 +394,7 @@ public class CombinedRealm extends Realm
}
@Override
+@Deprecated
protected String getName() {
return name;
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1771266&r1=1771265&r2=1771266&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Fri Nov 25
09:41:40 2016
@@ -73,7 +73,9 @@ public class DataSourceRealm extends Rea
/**
* Descriptive information about this Realm implementation.
+ * @deprecated This will be removed in Tomcat 9 onwards.
*/
+@Deprecated
protected static final String name = "DataSourceRealm";
@@ -400,14 +402,10 @@ public class DataSourceRealm extends Rea
return null;
}
-/**
- * Return a short name for this Realm implementation.
- */
@Override
+@Deprecated
protected String getName() {
-
-return (name);
-
+return name;
}
/**
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1771266&r1=1771265&r2=1771266&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Nov 25
09:41:40 2016
@@ -141,7 +141,9 @@ public class JAASRealm extends RealmBase
/**
* Descriptive information about this Realm implementation.
+ * @deprecated This will be removed in Tomcat 9 onwards.
*/
+@Deprecated
protected static final String name = "JAASRealm";
@@ -468,14 +470,11 @@ public class JAASRealm extends RealmBase
}
}
-/**
- * @return a short name for this Realm implementation.
- */
+
@Override
+@Deprecated
protected String getName() {
-
-return (name);
-
+return name;
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1771266&r1=1771265&r2=1771266&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java Fri Nov 25
09:41:40 2016
@@ -93,7 +93,9 @@ public class JDBCRealm
/**
* Descriptive information about this Realm implementation.
+ * @deprecated This will be removed in Tomcat 9 onwards.
*/
+@Deprecated
protected static final String name = "JDBCRealm";
@@ -500,14 +502,10 @@ public class JDBCRealm
}
-/**
- * @return a short name for this Realm implementation.
- */
@Override
+@Deprecated
protected String getName() {
-
-return (name);
-
+return name;
}
Modified: tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/jav
svn commit: r1771267 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/
Author: markt Date: Fri Nov 25 09:43:48 2016 New Revision: 1771267 URL: http://svn.apache.org/viewvc?rev=1771267&view=rev Log: Deprecate RealmBase.getName() Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/CombinedRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/DataSourceRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JAASRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JDBCRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/JNDIRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/MemoryRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/NullRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java tomcat/tc8.5.x/trunk/java/org/apache/catalina/startup/Tomcat.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/startup/TesterMapRealm.java Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 25 09:43:48 2016 @@ -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,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,1747536,1747 924,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-1756410,1 756778,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,17602
svn commit: r1771269 - in /tomcat/trunk: java/org/apache/catalina/realm/ java/org/apache/catalina/startup/ test/org/apache/catalina/startup/ webapps/docs/
Author: markt
Date: Fri Nov 25 09:48:26 2016
New Revision: 1771269
URL: http://svn.apache.org/viewvc?rev=1771269&view=rev
Log:
Remove deprecated RealmBase.getName() and associated code.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
tomcat/trunk/java/org/apache/catalina/realm/JNDIRealm.java
tomcat/trunk/java/org/apache/catalina/realm/LockOutRealm.java
tomcat/trunk/java/org/apache/catalina/realm/MemoryRealm.java
tomcat/trunk/java/org/apache/catalina/realm/NullRealm.java
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/java/org/apache/catalina/realm/UserDatabaseRealm.java
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
tomcat/trunk/test/org/apache/catalina/startup/TesterMapRealm.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/CombinedRealm.java Fri Nov 25
09:48:26 2016
@@ -51,13 +51,6 @@ public class CombinedRealm extends Realm
protected final List realms = new LinkedList<>();
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
-@Deprecated
-protected static final String name = "CombinedRealm";
-
-/**
* Add a realm to the list of realms that will be used to authenticate
* users.
* @param theRealm realm which should be wrapped by the combined realm
@@ -394,12 +387,6 @@ public class CombinedRealm extends Realm
}
@Override
-@Deprecated
-protected String getName() {
-return name;
-}
-
-@Override
protected String getPassword(String username) {
// This method should never be called
// Stack trace will show where this was called from
Modified: tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/DataSourceRealm.java Fri Nov 25
09:48:26 2016
@@ -72,14 +72,6 @@ public class DataSourceRealm extends Rea
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
-@Deprecated
-protected static final String name = "DataSourceRealm";
-
-
-/**
* The column in the user role table that names a role
*/
protected String roleNameCol = null;
@@ -402,12 +394,6 @@ public class DataSourceRealm extends Rea
return null;
}
-@Override
-@Deprecated
-protected String getName() {
-return name;
-}
-
/**
* @return the password associated with the given principal's user name.
*/
Modified: tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/JAASRealm.java Fri Nov 25
09:48:26 2016
@@ -140,14 +140,6 @@ public class JAASRealm extends RealmBase
/**
- * Descriptive information about this Realm implementation.
- * @deprecated This will be removed in Tomcat 9 onwards.
- */
-@Deprecated
-protected static final String name = "JAASRealm";
-
-
-/**
* The list of role class names, split out for easy processing.
*/
protected final List roleClasses = new ArrayList<>();
@@ -471,13 +463,6 @@ public class JAASRealm extends RealmBase
}
-@Override
-@Deprecated
-protected String getName() {
-return name;
-}
-
-
/**
* @return the password associated with the given principal's user name.
This
* always returns null as the JAASRealm has no way of obtaining this
Modified: tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/JDBCRealm.java?rev=1771269&r1=1771268&r2=1771269&view=diff
=
[Bug 60381] Inconsistent toString() in ValveBase and RealmBase
https://bz.apache.org/bugzilla/show_bug.cgi?id=60381 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #6 from Mark Thomas --- Fixed in: - trunk for 9.0.0.M14 onwards I also applied the clean-up to Realm.getName() -- 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 60385] ServletRequestListener.requestDestroyed not invoked after exception in requestInitialized
https://bz.apache.org/bugzilla/show_bug.cgi?id=60385 Mark Thomas changed: What|Removed |Added Status|REOPENED|RESOLVED Resolution|--- |INVALID --- Comment #6 from Mark Thomas --- There is additional specification language that supports Tomcat's implementation in the Javadoc for ServletRequestListener: A ServletRequest is defined as coming into scope of a web application when it is about to enter the first servlet or filter of the web application, and as going out of scope as it exits the last servlet or the first filter in the chain. An exception in requestInitialized() will prevent the request entering the first servlet/filter so it can never exit it. It probably wouldn't hurt for the spec to be more explicit on the expected behaviour here. I have no particular preference on what that should be but based on what the spec currently says, I believe that Tomcat's implementation is spec compliant. -- 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 60394] Unreliable 'ant test' on Oracle JDK 7 due to certificate error
https://bz.apache.org/bugzilla/show_bug.cgi?id=60394 Mark Thomas changed: What|Removed |Added Resolution|--- |WONTFIX Status|NEW |RESOLVED --- Comment #2 from Mark Thomas --- This is going to become increasingly problematic given the long lifetime of a Tomcat release compared to the lifetime of public Java releases. The pace of change of what is considered a minimal acceptable TLS configuration is also likely to cause problems. Users building locally can use a newer JDK. If they want to build using an older JDK because that is the version they are using in production then the expectation is that they use a supported JDK which should include any necessary updates. Release managers can work-around this by downloading manually or specifying a specific mirror. If we start to see issues with the CI system then we can use the same options as the release managers. At this point, I don't think we should start switching mirrors because people want to build with unsupported software. If the problem becomes more significant, we can re-evaluate. -- 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 60394] Unreliable 'ant test' on Oracle JDK 7 due to certificate error
https://bz.apache.org/bugzilla/show_bug.cgi?id=60394 --- Comment #3 from Emmanuel Bourg --- It should be possible to work around this issue by running once the build with the latest version of Java 8 containing the Let's Encrypt root certificate to download the build dependencies, and then build with Java 7. Alternatively, the Tomcat build could probably use the Maven Ant tasks to fetch the dependencies from Maven Central instead of the SourceForge mirrors. -- 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 60400] HttpServletRequest.getReader doesn't correctly read data
https://bz.apache.org/bugzilla/show_bug.cgi?id=60400 --- Comment #3 from Violeta Georgieva --- Thanks, I reproduced the issue. I'll update the issue with my findings later. Regards, Violeta -- 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: r1771316 - in /tomcat/trunk: java/org/apache/catalina/connector/InputBuffer.java test/org/apache/catalina/connector/TestInputBuffer.java webapps/docs/changelog.xml
Author: violetagg
Date: Fri Nov 25 14:14:29 2016
New Revision: 1771316
URL: http://svn.apache.org/viewvc?rev=1771316&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60400
When expanding the buffer used for reading the request body, ensure the read
position will be restored to the original one.
Modified:
tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java?rev=1771316&r1=1771315&r2=1771316&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/InputBuffer.java Fri Nov 25
14:14:29 2016
@@ -666,9 +666,11 @@ public class InputBuffer extends Reader
}
CharBuffer tmp = CharBuffer.allocate(newSize);
+int oldPosition = cb.position();
cb.position(0);
tmp.put(cb);
tmp.flip();
+tmp.position(oldPosition);
cb = tmp;
tmp = null;
}
Modified: tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1771316&r1=1771315&r2=1771316&view=diff
==
--- tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java Fri
Nov 25 14:14:29 2016
@@ -16,11 +16,13 @@
*/
package org.apache.catalina.connector;
+import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
import java.io.Writer;
import java.nio.charset.MalformedInputException;
import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -59,6 +61,25 @@ public class TestInputBuffer extends Tom
}
+@Test
+public void testBug60400() throws Exception {
+Tomcat tomcat = getTomcatInstance();
+Context root = tomcat.addContext("", TEMP_DIR);
+Tomcat.addServlet(root, "Bug60400Servlet", new Bug60400Servlet());
+root.addServletMappingDecoded("/", "Bug60400Servlet");
+
+tomcat.getConnector().setProperty("appReadBufSize", "9000");
+tomcat.start();
+
+ByteChunk bc = new ByteChunk();
+byte[] requestBody = new byte[9500];
+Arrays.fill(requestBody, (byte) 1);
+int rc = postUrl(requestBody, "http://localhost:"; + getPort() + "/",
bc, null);
+Assert.assertEquals(HttpServletResponse.SC_OK, rc);
+Assert.assertEquals(requestBody.length, bc.getLength());
+}
+
+
private void doUtf8BodyTest(String description, int[] input,
String expected) throws Exception {
@@ -118,4 +139,23 @@ public class TestInputBuffer extends Tom
}
}
}
+
+
+private static class Bug60400Servlet extends HttpServlet {
+
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+throws ServletException, IOException {
+StringBuilder builder = new StringBuilder();
+try (BufferedReader reader = req.getReader()) {
+String line;
+while ((line = reader.readLine()) != null) {
+builder.append(line);
+}
+}
+resp.getWriter().print(builder);
+}
+}
}
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1771316&r1=1771315&r2=1771316&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 25 14:14:29 2016
@@ -117,6 +117,11 @@
along with the various constants used by the sub-classes to store the
return value. (markt)
+
+60400: When expanding the buffer used for reading the
+request body, ensure the read position will be restored to the
+original one. (violetagg)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1771317 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/connector/InputBuffer.java test/org/apache/catalina/connector/TestInputBuffer.java webapps/docs/changelog.xml
Author: violetagg Date: Fri Nov 25 14:17:35 2016 New Revision: 1771317 URL: http://svn.apache.org/viewvc?rev=1771317&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60400 When expanding the buffer used for reading the request body, ensure the read position will be restored to the original one. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/connector/InputBuffer.java tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 25 14:17:35 2016 @@ -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,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,1747536,1747 924,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-1756410,1 756778,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,1762168,176217 2,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,176
[Bug 60400] HttpServletRequest.getReader doesn't correctly read data
https://bz.apache.org/bugzilla/show_bug.cgi?id=60400 Violeta Georgieva changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #4 from Violeta Georgieva --- Hi, The issue was the following: In some cases the buffer used for the request data needs to be expanded. The read position after the expansion was not returned to the correct one. This has been fixed in - 9.0.x for 9.0.0.M14 onwards and - 8.5.x for 8.5.9 onwards Regard, Violeta -- 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: r1771377 [1/2] - in /tomcat/trunk: java/org/apache/catalina/mbeans/ webapps/docs/
Author: markt
Date: Fri Nov 25 20:40:04 2016
New Revision: 1771377
URL: http://svn.apache.org/viewvc?rev=1771377&view=rev
Log:
Refactor the MBean implementations for the internal Tomcat components to
reduce code duplication.
Formatting clean-up
Added:
tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java (with
props)
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ConnectorMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContainerMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextEnvironmentMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceLinkMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ContextResourceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/GlobalResourcesLifecycleListener.java
tomcat/trunk/java/org/apache/catalina/mbeans/GroupMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/MemoryUserDatabaseMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/NamingResourcesMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/RoleMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
tomcat/trunk/java/org/apache/catalina/mbeans/UserMBean.java
tomcat/trunk/webapps/docs/changelog.xml
Added: tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java?rev=1771377&view=auto
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java (added)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java Fri Nov
25 20:40:04 2016
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.catalina.mbeans;
+
+import javax.management.InstanceNotFoundException;
+import javax.management.MBeanException;
+import javax.management.RuntimeOperationsException;
+import javax.management.modelmbean.InvalidTargetObjectTypeException;
+
+import org.apache.tomcat.util.modeler.BaseModelMBean;
+
+public abstract class BaseCatalinaMBean extends BaseModelMBean {
+
+protected BaseCatalinaMBean() throws MBeanException,
RuntimeOperationsException {
+super();
+}
+
+
+protected T doGetManagedResource() throws MBeanException {
+try {
+@SuppressWarnings("unchecked")
+T resource = (T) getManagedResource();
+return resource;
+} catch (InstanceNotFoundException | RuntimeOperationsException |
+InvalidTargetObjectTypeException e) {
+throw new MBeanException(e);
+}
+}
+
+
+protected static Object newInstance(String type) throws MBeanException {
+try {
+return Class.forName(type).newInstance();
+} catch (InstantiationException | IllegalAccessException |
ClassNotFoundException e) {
+throw new MBeanException(e);
+}
+}
+}
Propchange: tomcat/trunk/java/org/apache/catalina/mbeans/BaseCatalinaMBean.java
--
svn:eol-style = native
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java?rev=1771377&r1=1771376&r2=1771377&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java Fri Nov 25
20:40:04 2016
@@ -14,16 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.mbeans;
-
import javax.management.MBeanException;
import javax.management.RuntimeOperationsException;
-import org.apache.tomcat.util.modeler.BaseModelMBean;
-
-
/**
* A convenience base class for ModelMBean implementations
* where the underlying base class (and
svn commit: r1771377 [2/2] - in /tomcat/trunk: java/org/apache/catalina/mbeans/ webapps/docs/
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java?rev=1771377&r1=1771376&r2=1771377&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ServiceMBean.java Fri Nov 25
20:40:04 2016
@@ -14,28 +14,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.catalina.mbeans;
-import javax.management.InstanceNotFoundException;
import javax.management.MBeanException;
import javax.management.RuntimeOperationsException;
-import javax.management.modelmbean.InvalidTargetObjectTypeException;
import org.apache.catalina.Executor;
import org.apache.catalina.Service;
import org.apache.catalina.connector.Connector;
-import org.apache.tomcat.util.modeler.BaseModelMBean;
-
-public class ServiceMBean extends BaseModelMBean {
-public ServiceMBean()
-throws MBeanException, RuntimeOperationsException {
+public class ServiceMBean extends BaseCatalinaMBean {
+public ServiceMBean() throws MBeanException, RuntimeOperationsException {
super();
-
}
+
/**
* Add a new Connector to the set of defined Connectors, and associate it
* with this Service's Container.
@@ -49,16 +43,7 @@ public class ServiceMBean extends BaseMo
*/
public void addConnector(String address, int port, boolean isAjp, boolean
isSSL) throws MBeanException {
-Service service;
-try {
-service = (Service)getManagedResource();
-} catch (InstanceNotFoundException e) {
-throw new MBeanException(e);
-} catch (RuntimeOperationsException e) {
-throw new MBeanException(e);
-} catch (InvalidTargetObjectTypeException e) {
-throw new MBeanException(e);
-}
+Service service = doGetManagedResource();
String protocol = isAjp ? "AJP/1.3" : "HTTP/1.1";
Connector connector = new Connector(protocol);
if ((address!=null) && (address.length()>0)) {
@@ -69,42 +54,21 @@ public class ServiceMBean extends BaseMo
connector.setScheme(isSSL ? "https" : "http");
service.addConnector(connector);
-
}
+
/**
* Adds a named executor to the service
* @param type Classname of the Executor to be added
* @throws MBeanException error creating the executor
*/
public void addExecutor(String type) throws MBeanException {
-
-Service service;
-try {
-service = (Service)getManagedResource();
-} catch (InstanceNotFoundException e) {
-throw new MBeanException(e);
-} catch (RuntimeOperationsException e) {
-throw new MBeanException(e);
-} catch (InvalidTargetObjectTypeException e) {
-throw new MBeanException(e);
-}
-
-Executor executor;
-try {
- executor = (Executor)Class.forName(type).newInstance();
-} catch (InstantiationException e) {
-throw new MBeanException(e);
-} catch (IllegalAccessException e) {
-throw new MBeanException(e);
-} catch (ClassNotFoundException e) {
-throw new MBeanException(e);
-}
-
+Service service = doGetManagedResource();
+Executor executor = (Executor) newInstance(type);
service.addExecutor(executor);
-
}
+
/**
* Find and return the set of Connectors associated with this Service.
* @return an array of string representations of the connectors
@@ -112,28 +76,19 @@ public class ServiceMBean extends BaseMo
*/
public String[] findConnectors() throws MBeanException {
-Service service;
-try {
-service = (Service)getManagedResource();
-} catch (InstanceNotFoundException e) {
-throw new MBeanException(e);
-} catch (RuntimeOperationsException e) {
-throw new MBeanException(e);
-} catch (InvalidTargetObjectTypeException e) {
-throw new MBeanException(e);
-}
+Service service = doGetManagedResource();
Connector[] connectors = service.findConnectors();
String[] str = new String[connectors.length];
-for(int i=0; i< connectors.length; i++){
+for(int i = 0; i < connectors.length; i++) {
str[i] = connectors[i].toString();
}
return str;
-
}
+
/**
* Retrieves all executors.
* @return an array of string representations of the executors
@@ -141,27 +96,19 @@ public class ServiceMBean extends BaseMo
*/
public String[] findExecutors() throws MBeanException {
-Service service;
-try {
-service = (Service)getManage
svn commit: r1771380 - /tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Author: markt Date: Fri Nov 25 20:42:30 2016 New Revision: 1771380 URL: http://svn.apache.org/viewvc?rev=1771380&view=rev Log: ws police Modified: tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java Modified: tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1771380&r1=1771379&r2=1771380&view=diff == --- tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java (original) +++ tomcat/trunk/test/org/apache/catalina/connector/TestInputBuffer.java Fri Nov 25 20:42:30 2016 @@ -73,7 +73,7 @@ public class TestInputBuffer extends Tom ByteChunk bc = new ByteChunk(); byte[] requestBody = new byte[9500]; -Arrays.fill(requestBody, (byte) 1); +Arrays.fill(requestBody, (byte) 1); int rc = postUrl(requestBody, "http://localhost:"; + getPort() + "/", bc, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); Assert.assertEquals(requestBody.length, bc.getLength()); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1771381 - /tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
Author: markt
Date: Fri Nov 25 20:43:20 2016
New Revision: 1771381
URL: http://svn.apache.org/viewvc?rev=1771381&view=rev
Log:
Fix Javadoc nag
Modified:
tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
Modified: tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java?rev=1771381&r1=1771380&r2=1771381&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java (original)
+++ tomcat/trunk/java/org/apache/catalina/mbeans/ClassNameMBean.java Fri Nov 25
20:43:20 2016
@@ -28,6 +28,8 @@ import javax.management.RuntimeOperation
* MBean attribute named className, which reports the fully
* qualified class name of the managed object as its value.
*
+ * @param The type that this bean represents.
+ *
* @author Craig R. McClanahan
*/
public class ClassNameMBean extends BaseCatalinaMBean {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1771386 - in /tomcat/trunk: java/org/apache/catalina/realm/LocalStrings.properties java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml
Author: markt
Date: Fri Nov 25 20:57:24 2016
New Revision: 1771386
URL: http://svn.apache.org/viewvc?rev=1771386&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60395
Log when an Authenticator passes an incomplete GSSContext to a Realm since it
indicates a bug in the Authenticator.
Patch provided by Michael Osipov.
Modified:
tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties?rev=1771386&r1=1771385&r2=1771386&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/catalina/realm/LocalStrings.properties Fri Nov
25 20:57:24 2016
@@ -73,6 +73,7 @@ realmBase.createUsernameRetriever.Instan
realmBase.createUsernameRetriever.IllegalAccessException=Cannot create object
of type {0}.
realmBase.credentialHandler.customCredentialHandler=Unable to set the property
[{0}] to value [{1}] as a custom CredentialHandler has been configured
realmBase.cannotGetRoles=Cannot get roles from principal [{0}]
+realmBase.gssContextNotEstablished=Authenticator implementation error: the
passed security context is not fully established
userDatabaseRealm.lookup=Exception looking up UserDatabase under key {0}
userDatabaseRealm.noDatabase=No UserDatabase component found under key {0}
dataSourceRealm.authenticateFailure=Username {0} NOT successfully authenticated
Modified: tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java?rev=1771386&r1=1771385&r2=1771386&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java (original)
+++ tomcat/trunk/java/org/apache/catalina/realm/RealmBase.java Fri Nov 25
20:57:24 2016
@@ -509,6 +509,8 @@ public abstract class RealmBase extends
}
return getPrincipal(name, gssCredential);
}
+} else {
+log.error(sm.getString("realmBase.gssContextNotEstablished"));
}
// Fail in all other cases
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1771386&r1=1771385&r2=1771386&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Fri Nov 25 20:57:24 2016
@@ -118,6 +118,12 @@
return value. (markt)
+60395: Log when an Authenticator passes an
+incomplete GSSContext to a Realm since it indicates a bug
+in the Authenticator. Patch provided by Michael Osipov.
+(markt)
+
+
60400: When expanding the buffer used for reading the
request body, ensure the read position will be restored to the
original one. (violetagg)
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1771387 - in /tomcat/tc8.5.x/trunk: ./ java/org/apache/catalina/realm/LocalStrings.properties java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml
Author: markt Date: Fri Nov 25 20:58:00 2016 New Revision: 1771387 URL: http://svn.apache.org/viewvc?rev=1771387&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60395 Log when an Authenticator passes an incomplete GSSContext to a Realm since it indicates a bug in the Authenticator. Patch provided by Michael Osipov. Modified: tomcat/tc8.5.x/trunk/ (props changed) tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties tomcat/tc8.5.x/trunk/java/org/apache/catalina/realm/RealmBase.java tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.5.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 25 20:58:00 2016 @@ -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,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,1747536,1747 924,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-1756410,1 756778,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,1762168,176217 2,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,1763
svn commit: r1771388 - /tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java
Author: markt Date: Fri Nov 25 20:58:43 2016 New Revision: 1771388 URL: http://svn.apache.org/viewvc?rev=1771388&view=rev Log: ws police Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java Modified: tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java URL: http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java?rev=1771388&r1=1771387&r2=1771388&view=diff == --- tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java (original) +++ tomcat/tc8.5.x/trunk/test/org/apache/catalina/connector/TestInputBuffer.java Fri Nov 25 20:58:43 2016 @@ -73,7 +73,7 @@ public class TestInputBuffer extends Tom ByteChunk bc = new ByteChunk(); byte[] requestBody = new byte[9500]; -Arrays.fill(requestBody, (byte) 1); +Arrays.fill(requestBody, (byte) 1); int rc = postUrl(requestBody, "http://localhost:"; + getPort() + "/", bc, null); Assert.assertEquals(HttpServletResponse.SC_OK, rc); Assert.assertEquals(requestBody.length, bc.getLength()); - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1771389 - in /tomcat/tc8.0.x/trunk: ./ java/org/apache/catalina/realm/LocalStrings.properties java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml
Author: markt Date: Fri Nov 25 21:00:05 2016 New Revision: 1771389 URL: http://svn.apache.org/viewvc?rev=1771389&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60395 Log when an Authenticator passes an incomplete GSSContext to a Realm since it indicates a bug in the Authenticator. Patch provided by Michael Osipov. Modified: tomcat/tc8.0.x/trunk/ (props changed) tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties tomcat/tc8.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java tomcat/tc8.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc8.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 25 21:00:05 2016 @@ -1,2 +1,2 @@ /tomcat/tc8.5.x/trunk:1735042,1737966,1743139-1743140,1744151,1747537,1747925,1748002,1754614,1754643,1762124,1762183,1762203,1763792 -/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,
svn commit: r1771392 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/realm/LocalStrings.properties java/org/apache/catalina/realm/RealmBase.java webapps/docs/changelog.xml
Author: markt Date: Fri Nov 25 21:03:39 2016 New Revision: 1771392 URL: http://svn.apache.org/viewvc?rev=1771392&view=rev Log: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60395 Log when an Authenticator passes an incomplete GSSContext to a Realm since it indicates a bug in the Authenticator. Patch provided by Michael Osipov. Modified: tomcat/tc7.0.x/trunk/ (props changed) tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/LocalStrings.properties tomcat/tc7.0.x/trunk/java/org/apache/catalina/realm/RealmBase.java tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Propchange: tomcat/tc7.0.x/trunk/ -- --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Nov 25 21:03:39 2016 @@ -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,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,1702739,1702 742,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,1725974,1 726171-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 -/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,1750016,1750057,1750976,175
[Bug 60395] Log if GSSContext passed to RealmBase#authenticate(GSSContext, boolean) is not fully established
https://bz.apache.org/bugzilla/show_bug.cgi?id=60395 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |FIXED --- Comment #2 from Mark Thomas --- Thanks for the report and the patch. Fixed in: - trunk for 9.0.0.M14 onwards - 8.5.x for 8.5.9 onwards - 8.0.x for 8.0.40 onwards - 7.0.x for 7.0.74 onwards -- 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 60394] Unreliable 'ant test' on Oracle JDK 7 due to certificate error
https://bz.apache.org/bugzilla/show_bug.cgi?id=60394 --- Comment #4 from Michael Osipov <1983-01...@gmx.net> --- (In reply to Emmanuel Bourg from comment #3) > It should be possible to work around this issue by running once the build > with the latest version of Java 8 containing the Let's Encrypt root > certificate to download the build dependencies, and then build with Java 7. > > Alternatively, the Tomcat build could probably use the Maven Ant tasks to > fetch the dependencies from Maven Central instead of the SourceForge mirrors. I expect an ASF project to download artifact from our source only: Maven Central. This is proved to work and we have good contact to Sonatype for this. The Maven Ant Tasks have been deprectated long time ago by us (the Maven team). They are dead. I strongly recommend using Aether Ant Tasks which will be soon at at the ASF as Maven Resolver Ant Tasks. -- 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 60394] Unreliable 'ant test' on Oracle JDK 7 due to certificate error
https://bz.apache.org/bugzilla/show_bug.cgi?id=60394 --- Comment #5 from Michael Osipov <1983-01...@gmx.net> --- (In reply to Mark Thomas from comment #2) > This is going to become increasingly problematic given the long lifetime of > a Tomcat release compared to the lifetime of public Java releases. The pace > of change of what is considered a minimal acceptable TLS configuration is > also likely to cause problems. > > Users building locally can use a newer JDK. If they want to build using an > older JDK because that is the version they are using in production then the > expectation is that they use a supported JDK which should include any > necessary updates. > > Release managers can work-around this by downloading manually or specifying > a specific mirror. > > If we start to see issues with the CI system then we can use the same > options as the release managers. > > At this point, I don't think we should start switching mirrors because > people want to build with unsupported software. If the problem becomes more > significant, we can re-evaluate. I don't expect a bullet-proof fix. I do use Java 8, but wanted simply to indicate that this may be an issue to others. It should be at least documented on BUILDING.txt. -- 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
