[tomcat] branch master updated: Enable debug logging in case #4394 failure occurs again

2019-05-28 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 93c5ffc  Enable debug logging in case #4394 failure occurs again
93c5ffc is described below

commit 93c5ffcc9d5c51d442a8f9576156859dc200cbc7
Author: remm 
AuthorDate: Wed May 29 01:06:55 2019 +0200

Enable debug logging in case #4394 failure occurs again
---
 conf/logging.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/logging.properties b/conf/logging.properties
index e8b7b16..fc52083 100644
--- a/conf/logging.properties
+++ b/conf/logging.properties
@@ -73,7 +73,7 @@ 
org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].ha
 #org.apache.jasper.compiler.TldLocationsCache.level = FINE
 
 # To see debug messages for HTTP/2 handling, uncomment the following line:
-#org.apache.coyote.http2.level = FINE
+org.apache.coyote.http2.level = FINE
 
 # To see debug messages for WebSocket handling, uncomment the following line:
 #org.apache.tomcat.websocket.level = FINE


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Add utility Server listener

2019-05-28 Thread Rémy Maucherat 
On Tue, May 28, 2019 at 11:04 PM Rémy Maucherat  wrote:

> On Tue, May 28, 2019 at 10:47 PM Mark Thomas  wrote:
>
>> On 28/05/2019 15:40, r...@apache.org wrote:
>> > This is an automated email from the ASF dual-hosted git repository.
>> >
>> > remm pushed a commit to branch master
>> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
>> >
>> >
>> > The following commit(s) were added to refs/heads/master by this push:
>> >  new c5fbb15  Add utility Server listener
>> > c5fbb15 is described below
>> >
>> > commit c5fbb158f7e91306a010dd95f4f13996991dd8fd
>> > Author: remm 
>> > AuthorDate: Tue May 28 16:40:30 2019 +0200
>> >
>> > Add utility Server listener
>> >
>> > Its purpose is to replicate adding a Listener in context.xml. Also
>> add
>> > new container events to notify container add and remove before
>> start and
>> > after stop (respectively) so that containers can actually be
>> configured
>> > before a possible lifecycle change.
>>
>> 
>>
>> > ---
>> >  java/org/apache/catalina/Container.java|  14 +++
>> >  java/org/apache/catalina/core/ContainerBase.java   |   4 +
>> >  .../apache/catalina/core/FrameworkListener.java| 114
>> +
>> >  webapps/docs/changelog.xml |  10 ++
>> >  4 files changed, 142 insertions(+)
>> >
>> > diff --git a/java/org/apache/catalina/Container.java
>> b/java/org/apache/catalina/Container.java
>> > index 177b2d2..0b30247 100644
>> > --- a/java/org/apache/catalina/Container.java
>> > +++ b/java/org/apache/catalina/Container.java
>> > @@ -84,6 +84,13 @@ public interface Container extends Lifecycle {
>> >
>> >  /**
>> >   * The ContainerEvent event type sent when a child container is
>> added
>> > + * by addChild(), but before it is started.
>> > + */
>> > +public static final String ADD_CHILD_BEFORE_START_EVENT =
>> "addChildBeforeStart";
>>
>> Is this necessary? The listener can check the status of the parent if
>> that matters can't it?
>>
>
> I found it necessary (to be honest, it's more like the add/remove child
> events are misplaced, but I'd rather not move them).
>

Alternative:

diff --git a/java/org/apache/catalina/core/ContainerBase.java
b/java/org/apache/catalina/core/ContainerBase.java
index f3a3011..ff8d16c 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -703,7 +703,7 @@
 children.put(child.getName(), child);
 }

-fireContainerEvent(ADD_CHILD_BEFORE_START_EVENT, child);
+fireContainerEvent(ADD_CHILD_EVENT, child);

 // Start child
 // Don't do this inside sync block - start can be a slow process
and
@@ -716,8 +716,6 @@
 }
 } catch (LifecycleException e) {
 throw new
IllegalStateException(sm.getString("containerBase.child.start"), e);
-} finally {
-fireContainerEvent(ADD_CHILD_EVENT, child);
 }
 }

@@ -800,7 +798,7 @@
 return;
 }

-fireContainerEvent(REMOVE_CHILD_BEFORE_STOP_EVENT, child);
+fireContainerEvent(REMOVE_CHILD_EVENT, child);

 try {
 if (child.getState().isAvailable()) {
@@ -826,8 +824,6 @@
 return;
 children.remove(child.getName());
 }
-
-fireContainerEvent(REMOVE_CHILD_EVENT, child);
 }

The only other use is the MapperListener, which will not be broken since it
goes out of its way to check the context start state (it will not get the
lifecycle event in that case). This was originally misplaced in Tomcat ...
4.0.

Rémy

[tomcat] branch master updated: Remove useless method parameters

2019-05-28 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 99e2bb3  Remove useless method parameters
99e2bb3 is described below

commit 99e2bb3f285993f7d4861258d2c69d7988c6b5ee
Author: remm 
AuthorDate: Tue May 28 23:06:14 2019 +0200

Remove useless method parameters
---
 java/org/apache/catalina/core/FrameworkListener.java   | 10 --
 .../catalina/core/ThreadLocalLeakPreventionListener.java   |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/java/org/apache/catalina/core/FrameworkListener.java 
b/java/org/apache/catalina/core/FrameworkListener.java
index b2a4f27..4b8234b 100644
--- a/java/org/apache/catalina/core/FrameworkListener.java
+++ b/java/org/apache/catalina/core/FrameworkListener.java
@@ -57,11 +57,9 @@ public abstract class FrameworkListener implements 
LifecycleListener, ContainerL
 public void containerEvent(ContainerEvent event) {
 String type = event.getType();
 if (Container.ADD_CHILD_BEFORE_START_EVENT.equals(type)) {
-processContainerAddChild(event.getContainer(),
-(Container) event.getData());
+processContainerAddChild((Container) event.getData());
 } else if (Container.REMOVE_CHILD_BEFORE_STOP_EVENT.equals(type)) {
-processContainerRemoveChild(event.getContainer(),
-(Container) event.getData());
+processContainerRemoveChild((Container) event.getData());
 }
 }
 
@@ -95,7 +93,7 @@ public abstract class FrameworkListener implements 
LifecycleListener, ContainerL
 context.addLifecycleListener(createLifecycleListener(context));
 }
 
-protected void processContainerAddChild(Container parent, Container child) 
{
+protected void processContainerAddChild(Container child) {
 if (child instanceof Context) {
 registerContextListener((Context) child);
 } else if (child instanceof Engine) {
@@ -105,7 +103,7 @@ public abstract class FrameworkListener implements 
LifecycleListener, ContainerL
 }
 }
 
-protected void processContainerRemoveChild(Container parent, Container 
child) {
+protected void processContainerRemoveChild(Container child) {
 if (child instanceof Host || child instanceof Engine) {
 child.removeContainerListener(this);
 }
diff --git 
a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java 
b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
index 21905ab..eb33b18 100644
--- a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
@@ -107,13 +107,13 @@ public class ThreadLocalLeakPreventionListener extends 
FrameworkListener {
 
 }
 
-protected void processContainerRemoveChild(Container parent,
-Container child) {
+@Override
+protected void processContainerRemoveChild(Container child) {
 if (child instanceof Context) {
 Context context = (Context) child;
 context.removeLifecycleListener(this);
 } else {
-super.processContainerRemoveChild(parent, child);
+super.processContainerRemoveChild(child);
 }
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Add utility Server listener

2019-05-28 Thread Rémy Maucherat 
On Tue, May 28, 2019 at 10:47 PM Mark Thomas  wrote:

> On 28/05/2019 15:40, r...@apache.org wrote:
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > remm pushed a commit to branch master
> > in repository https://gitbox.apache.org/repos/asf/tomcat.git
> >
> >
> > The following commit(s) were added to refs/heads/master by this push:
> >  new c5fbb15  Add utility Server listener
> > c5fbb15 is described below
> >
> > commit c5fbb158f7e91306a010dd95f4f13996991dd8fd
> > Author: remm 
> > AuthorDate: Tue May 28 16:40:30 2019 +0200
> >
> > Add utility Server listener
> >
> > Its purpose is to replicate adding a Listener in context.xml. Also
> add
> > new container events to notify container add and remove before start
> and
> > after stop (respectively) so that containers can actually be
> configured
> > before a possible lifecycle change.
>
> 
>
> > ---
> >  java/org/apache/catalina/Container.java|  14 +++
> >  java/org/apache/catalina/core/ContainerBase.java   |   4 +
> >  .../apache/catalina/core/FrameworkListener.java| 114
> +
> >  webapps/docs/changelog.xml |  10 ++
> >  4 files changed, 142 insertions(+)
> >
> > diff --git a/java/org/apache/catalina/Container.java
> b/java/org/apache/catalina/Container.java
> > index 177b2d2..0b30247 100644
> > --- a/java/org/apache/catalina/Container.java
> > +++ b/java/org/apache/catalina/Container.java
> > @@ -84,6 +84,13 @@ public interface Container extends Lifecycle {
> >
> >  /**
> >   * The ContainerEvent event type sent when a child container is
> added
> > + * by addChild(), but before it is started.
> > + */
> > +public static final String ADD_CHILD_BEFORE_START_EVENT =
> "addChildBeforeStart";
>
> Is this necessary? The listener can check the status of the parent if
> that matters can't it?
>

I found it necessary (to be honest, it's more like the add/remove child
events are misplaced, but I'd rather not move them).

I'm now trying to improve CDI support (this was in my hackaton todo) and
this feature needs to replace the instance manager with a wrapped one. We
could previously replace the instance listener just fine, but CDI is OTOH a
simpler framework that would otherwise use all the Tomcat infrastructure
(naming, configuration, whatever). To do this in a clean way with CDI, the
instance manager replacement needs to happen after the naming listener gets
the start event, and before the actual default instance manager is created.
So I decided it would be nice to add a new hook for such frameworks, along
with a "new" utility server listener (100% ripped off
ThreadLocalLeakPreventionListener).

WIP: https://github.com/rmaucher/tomcat-owb


>
> > +/**
> > + * The ContainerEvent event type sent when a child container is
> added
> >   * by addChild().
> >   */
> >  public static final String ADD_CHILD_EVENT = "addChild";
> > @@ -98,6 +105,13 @@ public interface Container extends Lifecycle {
> >
> >  /**
> >   * The ContainerEvent event type sent when a child container is
> removed
> > + * by removeChild(), but before it is stopped.
> > + */
> > +public static final String REMOVE_CHILD_BEFORE_STOP_EVENT =
> "removeChildBeforeStop";
>
> Same here.
>
> > +/**
> > + * The ContainerEvent event type sent when a child container is
> removed
> >   * by removeChild().
> >   */
> >  public static final String REMOVE_CHILD_EVENT = "removeChild";
>
> 
>
> > diff --git a/java/org/apache/catalina/core/FrameworkListener.java
> b/java/org/apache/catalina/core/FrameworkListener.java
> > new file mode 100644
> > index 000..4927e49
>
> 
>
> > +private void processContainerAddChild(Container parent, Container
> child) {
>
> parent is unused. Can it be removed?
>
> > +if (child instanceof Context) {
> > +registerContextListener((Context) child);
> > +} else if (child instanceof Engine) {
> > +registerListenersForEngine((Engine) child);
> > +} else if (child instanceof Host) {
> > +registerListenersForHost((Host) child);
> > +}
> > +}
> > +
> > +private void processContainerRemoveChild(Container parent,
> Container child) {
>
> Same here.
>

These two were only used in a debug log, which I found obnoxious and I
trashed it. So the parameter is indeed useless now and I'll remove it.

Rémy

Re: [tomcat] branch master updated: Add utility Server listener

2019-05-28 Thread Mark Thomas 
On 28/05/2019 15:40, r...@apache.org wrote:
> This is an automated email from the ASF dual-hosted git repository.
> 
> remm pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
> 
> 
> The following commit(s) were added to refs/heads/master by this push:
>  new c5fbb15  Add utility Server listener
> c5fbb15 is described below
> 
> commit c5fbb158f7e91306a010dd95f4f13996991dd8fd
> Author: remm 
> AuthorDate: Tue May 28 16:40:30 2019 +0200
> 
> Add utility Server listener
> 
> Its purpose is to replicate adding a Listener in context.xml. Also add
> new container events to notify container add and remove before start and
> after stop (respectively) so that containers can actually be configured
> before a possible lifecycle change.



> ---
>  java/org/apache/catalina/Container.java|  14 +++
>  java/org/apache/catalina/core/ContainerBase.java   |   4 +
>  .../apache/catalina/core/FrameworkListener.java| 114 
> +
>  webapps/docs/changelog.xml |  10 ++
>  4 files changed, 142 insertions(+)
> 
> diff --git a/java/org/apache/catalina/Container.java 
> b/java/org/apache/catalina/Container.java
> index 177b2d2..0b30247 100644
> --- a/java/org/apache/catalina/Container.java
> +++ b/java/org/apache/catalina/Container.java
> @@ -84,6 +84,13 @@ public interface Container extends Lifecycle {
>  
>  /**
>   * The ContainerEvent event type sent when a child container is added
> + * by addChild(), but before it is started.
> + */
> +public static final String ADD_CHILD_BEFORE_START_EVENT = 
> "addChildBeforeStart";

Is this necessary? The listener can check the status of the parent if
that matters can't it?

> +/**
> + * The ContainerEvent event type sent when a child container is added
>   * by addChild().
>   */
>  public static final String ADD_CHILD_EVENT = "addChild";
> @@ -98,6 +105,13 @@ public interface Container extends Lifecycle {
>  
>  /**
>   * The ContainerEvent event type sent when a child container is removed
> + * by removeChild(), but before it is stopped.
> + */
> +public static final String REMOVE_CHILD_BEFORE_STOP_EVENT = 
> "removeChildBeforeStop";

Same here.

> +/**
> + * The ContainerEvent event type sent when a child container is removed
>   * by removeChild().
>   */
>  public static final String REMOVE_CHILD_EVENT = "removeChild";



> diff --git a/java/org/apache/catalina/core/FrameworkListener.java 
> b/java/org/apache/catalina/core/FrameworkListener.java
> new file mode 100644
> index 000..4927e49



> +private void processContainerAddChild(Container parent, Container child) 
> {

parent is unused. Can it be removed?

> +if (child instanceof Context) {
> +registerContextListener((Context) child);
> +} else if (child instanceof Engine) {
> +registerListenersForEngine((Engine) child);
> +} else if (child instanceof Host) {
> +registerListenersForHost((Host) child);
> +}
> +}
> +
> +private void processContainerRemoveChild(Container parent, Container 
> child) {

Same here.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot success in on tomcat-trunk

2019-05-28 Thread buildbot 
The Buildbot has detected a restored build on builder tomcat-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4396

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] 364a4686cd5dd651b7f8323e017581322389dd57
Blamelist: remm 

Build succeeded!

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Hack to avoid optional listener warn log

2019-05-28 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 364a468  Hack to avoid optional listener warn log
364a468 is described below

commit 364a4686cd5dd651b7f8323e017581322389dd57
Author: remm 
AuthorDate: Tue May 28 21:45:02 2019 +0200

Hack to avoid optional listener warn log
---
 java/org/apache/tomcat/util/digester/SetPropertiesRule.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java 
b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
index 03afccf..a3b38c7 100644
--- a/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
+++ b/java/org/apache/tomcat/util/digester/SetPropertiesRule.java
@@ -72,7 +72,9 @@ public class SetPropertiesRule extends Rule {
 if (!digester.isFakeAttribute(top, name)
 && !IntrospectionUtils.setProperty(top, name, value)
 && digester.getRulesValidation()) {
-digester.log.warn(sm.getString("rule.noProperty", 
digester.match, name, value));
+if (!"optional".equals(name)) {
+digester.log.warn(sm.getString("rule.noProperty", 
digester.match, name, value));
+}
 }
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Simplify thread local listener

2019-05-28 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new 20b6794  Simplify thread local listener
20b6794 is described below

commit 20b67945b055ddc0eef9d5d67ae754ab4533502b
Author: remm 
AuthorDate: Tue May 28 21:03:33 2019 +0200

Simplify thread local listener

I used ThreadLocalLeakPreventionListener for FrameworkListener, so use
it to remove duplicate code.
---
 .../apache/catalina/core/FrameworkListener.java| 12 +--
 .../core/ThreadLocalLeakPreventionListener.java| 85 +++---
 2 files changed, 17 insertions(+), 80 deletions(-)

diff --git a/java/org/apache/catalina/core/FrameworkListener.java 
b/java/org/apache/catalina/core/FrameworkListener.java
index 4927e49..b2a4f27 100644
--- a/java/org/apache/catalina/core/FrameworkListener.java
+++ b/java/org/apache/catalina/core/FrameworkListener.java
@@ -65,7 +65,7 @@ public abstract class FrameworkListener implements 
LifecycleListener, ContainerL
 }
 }
 
-private void registerListenersForServer(Server server) {
+protected void registerListenersForServer(Server server) {
 for (Service service : server.findServices()) {
 Engine engine = service.getContainer();
 if (engine != null) {
@@ -76,7 +76,7 @@ public abstract class FrameworkListener implements 
LifecycleListener, ContainerL
 
 }
 
-private void registerListenersForEngine(Engine engine) {
+protected void registerListenersForEngine(Engine engine) {
 for (Container hostContainer : engine.findChildren()) {
 Host host = (Host) hostContainer;
 host.addContainerListener(this);
@@ -84,18 +84,18 @@ public abstract class FrameworkListener implements 
LifecycleListener, ContainerL
 }
 }
 
-private void registerListenersForHost(Host host) {
+protected void registerListenersForHost(Host host) {
 for (Container contextContainer : host.findChildren()) {
 Context context = (Context) contextContainer;
 registerContextListener(context);
 }
 }
 
-private void registerContextListener(Context context) {
+protected void registerContextListener(Context context) {
 context.addLifecycleListener(createLifecycleListener(context));
 }
 
-private void processContainerAddChild(Container parent, Container child) {
+protected void processContainerAddChild(Container parent, Container child) 
{
 if (child instanceof Context) {
 registerContextListener((Context) child);
 } else if (child instanceof Engine) {
@@ -105,7 +105,7 @@ public abstract class FrameworkListener implements 
LifecycleListener, ContainerL
 }
 }
 
-private void processContainerRemoveChild(Container parent, Container 
child) {
+protected void processContainerRemoveChild(Container parent, Container 
child) {
 if (child instanceof Host || child instanceof Engine) {
 child.removeContainerListener(this);
 }
diff --git 
a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java 
b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
index 696e734..21905ab 100644
--- a/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
+++ b/java/org/apache/catalina/core/ThreadLocalLeakPreventionListener.java
@@ -21,10 +21,8 @@ import java.util.concurrent.Executor;
 
 import org.apache.catalina.Container;
 import org.apache.catalina.ContainerEvent;
-import org.apache.catalina.ContainerListener;
 import org.apache.catalina.Context;
 import org.apache.catalina.Engine;
-import org.apache.catalina.Host;
 import org.apache.catalina.Lifecycle;
 import org.apache.catalina.LifecycleEvent;
 import org.apache.catalina.LifecycleListener;
@@ -52,8 +50,7 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor;
  * This listener must be declared in server.xml to be active.
  *
  */
-public class ThreadLocalLeakPreventionListener implements LifecycleListener,
-ContainerListener {
+public class ThreadLocalLeakPreventionListener extends FrameworkListener {
 
 private static final Log log =
 LogFactory.getLog(ThreadLocalLeakPreventionListener.class);
@@ -73,17 +70,9 @@ public class ThreadLocalLeakPreventionListener implements 
LifecycleListener,
 @Override
 public void lifecycleEvent(LifecycleEvent event) {
 try {
-Lifecycle lifecycle = event.getLifecycle();
-if (Lifecycle.AFTER_START_EVENT.equals(event.getType()) &&
-lifecycle instanceof Server) {
-// when the server starts, we register ourself as listener for
-// all context
-// as well as container event listener so that we know when new
-// Context are deployed
-

Re: [Bug 43548] xml schema for tomcat-users.xml

2019-05-28 Thread Christopher Schultz 
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA256

Mark,

On 5/28/19 05:06, Mark Thomas wrote:
>> Mark,
>> 
>> On 5/23/19 17:09, bugzi...@apache.org wrote:
>>> https://bz.apache.org/bugzilla/show_bug.cgi?id=43548
>> 
>>> --- Comment #11 from Mark Thomas  --- Five
>>> years on and I changed my mind. I've added this to 7.0.x for
>>> 7.0.95 onwards.
>> 
>> Looking at this bug, I can see a link to the XSD for the
>> tomcat-users files. Unfortunately, it points to the svn
>> repository which has been removed/renamed.
>> 
>> Would it be possible to provide intelligent redirects to keep
>> old links working?
> 
> That would be a question for infra but there are disadvantages as
> well as advantages to doing that.
> 
> One of the advantages of moving the code to the archive folder is
> that it breaks existing checkouts which prevents accidental commits
> to code that is no longer being worked on.
> 
> If we did add such redirects, I'd suggest making the archive
> read-only apart from svn admins.

I was thinking more about redirecting the /viewvc/ URLs than the
subversion ones. Those are already read-only, and would only have been
used for reference.

So for example, redirect

http(s)://svn.apache.org/viewvc/tomcat/trunk/*

to

https://gitbox.apache.org/repos/asf?p=tomcat.git;a=tree;h=refs/heads/mas
ter;hb=refs/heads/master
(or some such)

- -chris
-BEGIN PGP SIGNATURE-
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/

iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlztYYwACgkQHPApP6U8
pFjfWQ//ceJahxsQC+0WDkBlTxmrJGgrxv2pQ1j75U7FTAgIWnBHERUk/9X2PHp8
PKXsJhJ/bYMGNsHV/o5Drw50EcpJqMM3Jhs1n9zfnfztnTWktlhlwlP1GJKnI+oG
UYKZfwwaJYElY8FJ26aOYD1+GzCLQRTtRqB0pVQJi39WiiqEs224M8zqHhH3uICH
QlXfHWC13q9jrTVXMhmgDOgFlgAtrHlCdRXSdpSBIlr8zITstDy0yKhkC0IZkPMQ
K/S3oRwTTqr/e09h5XbFLU7Secjj6tyalrOpL1WflenpVmzH4UdJ1deE8oJuiaZr
Kbp8heEW36WoH8KXJp8Of+TSCFOB+2hP6o2HZe9EYMsE+4SyiUB57Zgfu56HWMR9
Dqbt5P4BVcz/EbnYB+RBpQ1nssj876VfRf77umk0eVbcAlnAn4FoPB/oiUaPzaz2
R2b6IyityspqCrIOSmbf/nuP5Cc9tuTrH+4kuE9Cw/7XGwovwnVZYT4ARg5WORXa
8wAdUS1y+mWsBWDHak+tSJ/PvicggT1YgT8OlOgFeK5pdZHoihZFK6TW0Lfu/NmW
nkqFOVdn2u88O+/Siteq1wfT1F9tgBOlQw3yPIDMrpFfolaMv/uf/TAptzGOAjI8
siNa8Sp/vq/rOo3t88app7wW6L5rjUeticnultk0DjGYdXazlDA=
=4uhq
-END PGP SIGNATURE-

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in on tomcat-trunk

2019-05-28 Thread buildbot 
The Buildbot has detected a new failure on builder tomcat-trunk while building 
tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-trunk/builds/4394

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: silvanus_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' 
triggered this build
Build Source Stamp: [branch master] c5fbb158f7e91306a010dd95f4f13996991dd8fd
Blamelist: remm 

BUILD FAILED: failed compile_1

Sincerely,
 -The Buildbot




-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Are we interested in using any the GitHub features?

2019-05-28 Thread Coty Sutherland 
Hi,

Are we interested in utilizing any of the GitHub integration for Travis CI
, Coverity Scan
, LGTM
, etc? We could at least set them up
for testing PRs since we already have the Apache CI system that tests
commits. I see someone opened a PR to add travis.yaml, but then closed it
with no comment some time ago. I'm inquiring because I'm looking for ways
to make the project appear a bit more flashy to attract new contributors :)

You can see all the integrations that GitHub supports in their marketplace,
https://github.com/marketplace.



Thanks,
Coty

[tomcat] branch master updated: Add utility Server listener

2019-05-28 Thread remm 
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
 new c5fbb15  Add utility Server listener
c5fbb15 is described below

commit c5fbb158f7e91306a010dd95f4f13996991dd8fd
Author: remm 
AuthorDate: Tue May 28 16:40:30 2019 +0200

Add utility Server listener

Its purpose is to replicate adding a Listener in context.xml. Also add
new container events to notify container add and remove before start and
after stop (respectively) so that containers can actually be configured
before a possible lifecycle change.
---
 java/org/apache/catalina/Container.java|  14 +++
 java/org/apache/catalina/core/ContainerBase.java   |   4 +
 .../apache/catalina/core/FrameworkListener.java| 114 +
 webapps/docs/changelog.xml |  10 ++
 4 files changed, 142 insertions(+)

diff --git a/java/org/apache/catalina/Container.java 
b/java/org/apache/catalina/Container.java
index 177b2d2..0b30247 100644
--- a/java/org/apache/catalina/Container.java
+++ b/java/org/apache/catalina/Container.java
@@ -84,6 +84,13 @@ public interface Container extends Lifecycle {
 
 /**
  * The ContainerEvent event type sent when a child container is added
+ * by addChild(), but before it is started.
+ */
+public static final String ADD_CHILD_BEFORE_START_EVENT = 
"addChildBeforeStart";
+
+
+/**
+ * The ContainerEvent event type sent when a child container is added
  * by addChild().
  */
 public static final String ADD_CHILD_EVENT = "addChild";
@@ -98,6 +105,13 @@ public interface Container extends Lifecycle {
 
 /**
  * The ContainerEvent event type sent when a child container is removed
+ * by removeChild(), but before it is stopped.
+ */
+public static final String REMOVE_CHILD_BEFORE_STOP_EVENT = 
"removeChildBeforeStop";
+
+
+/**
+ * The ContainerEvent event type sent when a child container is removed
  * by removeChild().
  */
 public static final String REMOVE_CHILD_EVENT = "removeChild";
diff --git a/java/org/apache/catalina/core/ContainerBase.java 
b/java/org/apache/catalina/core/ContainerBase.java
index cee5e42..f3a3011 100644
--- a/java/org/apache/catalina/core/ContainerBase.java
+++ b/java/org/apache/catalina/core/ContainerBase.java
@@ -703,6 +703,8 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 children.put(child.getName(), child);
 }
 
+fireContainerEvent(ADD_CHILD_BEFORE_START_EVENT, child);
+
 // Start child
 // Don't do this inside sync block - start can be a slow process and
 // locking the children object can cause problems elsewhere
@@ -798,6 +800,8 @@ public abstract class ContainerBase extends 
LifecycleMBeanBase
 return;
 }
 
+fireContainerEvent(REMOVE_CHILD_BEFORE_STOP_EVENT, child);
+
 try {
 if (child.getState().isAvailable()) {
 child.stop();
diff --git a/java/org/apache/catalina/core/FrameworkListener.java 
b/java/org/apache/catalina/core/FrameworkListener.java
new file mode 100644
index 000..4927e49
--- /dev/null
+++ b/java/org/apache/catalina/core/FrameworkListener.java
@@ -0,0 +1,114 @@
+/*
+ * 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.core;
+
+import org.apache.catalina.Container;
+import org.apache.catalina.ContainerEvent;
+import org.apache.catalina.ContainerListener;
+import org.apache.catalina.Context;
+import org.apache.catalina.Engine;
+import org.apache.catalina.Host;
+import org.apache.catalina.Lifecycle;
+import org.apache.catalina.LifecycleEvent;
+import org.apache.catalina.LifecycleListener;
+import org.apache.catalina.Server;
+import org.apache.catalina.Service;
+
+/**
+ * This listener must be declared in server.xml as a Server listener, possibly 
optional.
+ * It will register a lifecycle listener on all contexts. This is an 
alternative to
+ * adding a Listener in context.xml with more flexibility.
+ */
+public abstract class FrameworkListener

Re: [tomcat] branch master updated: Sync on socketWrapper like the non async code does

2019-05-28 Thread Rémy Maucherat 
On Fri, May 24, 2019 at 10:17 AM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> remm pushed a commit to branch master
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/master by this push:
>  new af6536d  Sync on socketWrapper like the non async code does
> af6536d is described below
>
> commit af6536d9fe01961e795a36628eaeb15506ed6fbc
> Author: remm 
> AuthorDate: Fri May 24 10:17:12 2019 +0200
>
> Sync on socketWrapper like the non async code does
>
> Most likely readDataFrame and readContinuationFrame would need sync as
> well, so include them.
>

Ok, so the feedback is that the problem is fixed. I will not attempt to
find the cause of the "problem" (the regular code has a sync on the same
object, so it could be as expected) or make further fixes for now in an
attempt to keep things stable. 9.0.20 was regressing with HTTP/2, and I may
revisit this after 9.0.21.

Rémy

[tomcat] 01/03: Expand the coverage and quality of the French translations (remm)

2019-05-28 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit fce0e0c1422fcdb3caeac625616a879c9d5f7d8b
Author: Mark Thomas 
AuthorDate: Tue May 28 12:44:24 2019 +0100

Expand the coverage and quality of the French translations (remm)
---
 java/org/apache/coyote/LocalStrings_fr.properties   | 1 +
 java/org/apache/coyote/http2/LocalStrings_fr.properties | 4 
 java/org/apache/tomcat/util/http/LocalStrings_fr.properties | 1 +
 webapps/docs/changelog.xml  | 4 
 4 files changed, 10 insertions(+)

diff --git a/java/org/apache/coyote/LocalStrings_fr.properties 
b/java/org/apache/coyote/LocalStrings_fr.properties
index 8099fa3..e3c2cef 100644
--- a/java/org/apache/coyote/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/LocalStrings_fr.properties
@@ -17,6 +17,7 @@ abstractConnectionHandler.connectionsGet=Trouvé le processeur 
[{0}] pour le soc
 abstractConnectionHandler.error=Erreur de lecture de la requête, ignorée
 abstractConnectionHandler.ioexception.debug=Les IOException sont normales et 
sont ignorées
 abstractConnectionHandler.negotiatedProcessor.fail=Impossible de créer un 
processeur pour le protocole négocié [{0}]
+abstractConnectionHandler.oome=Echec de la fin de traitement d'une requête
 abstractConnectionHandler.process=Traitement du socket [{0}] avec le statut 
[{1}]
 abstractConnectionHandler.processorPop=Retrait du processeur [{0}] du cache
 abstractConnectionHandler.protocolexception.debug=Les ProtocolExceptions sont 
normales et sont ignorées
diff --git a/java/org/apache/coyote/http2/LocalStrings_fr.properties 
b/java/org/apache/coyote/http2/LocalStrings_fr.properties
index 2f73858..e6e1cf3 100644
--- a/java/org/apache/coyote/http2/LocalStrings_fr.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_fr.properties
@@ -37,7 +37,9 @@ hpack.invalidCharacter=Le caractère Unicode [{0}] ayant le 
code point [{1}] ne
 hpackEncoder.encodeHeader=Encodage de l''en-tête [{0}] avec la valeur [{1}]
 
 hpackdecoder.headerTableIndexInvalid=L''index [{0}] dans la table des en-têtes 
n''est pas valide car il y a [{1}] en-têtes statiques et [{2}] en-têtes 
dynamiques
+hpackdecoder.maxMemorySizeExceeded=La taille de la table des en-têtes [{0}] 
dépasse la taille maximale [{1}]
 hpackdecoder.notImplemented=Pas encore implémenté
+hpackdecoder.nullHeader=L''en-tête à l''index [{0}] est nul
 hpackdecoder.tableSizeUpdateNotAtStart=Toute mise à jour de la taille de la 
table doit être faite avant le début d'un bloc d'en-têtes
 hpackdecoder.zeroNotValidHeaderTableIndex=Zéro n'est pas un index valide dans 
la table des en-têtes
 
@@ -83,6 +85,7 @@ stream.header.connection=Connection [{0}], Flux [{1}], 
L''en-tête HTTP [connect
 stream.header.contentLength=Connection [{0}], Flux [{1}], La valeur de 
l''en-tête content-length [{2}] ne correspond pas à la taille des données reçue 
[{3}]
 stream.header.debug=Connection [{0}], Flux [{1}], en-tête HTTP [{2}], valeur 
[{3}]
 stream.header.duplicate=Connection [{0}], Flux [{1}], Reçu plusieurs en-têtes 
[{3}]
+stream.header.empty=Connection [{0}], Flux [{1}], Le nom d''en-tête nul est 
invalide
 stream.header.invalid=Connection [{0}], Flux [{1}], L''en-tête[{2}] contenait 
la valeur invalide [{3}]
 stream.header.noPath=Connection [{0}], flux [{1}], Le [:path] pseudo en-tête 
est vide
 stream.header.required=Connection [{0}], Flux [{1}], Un ou plusieurs en-têtes 
nécessaires sont manquants
@@ -125,6 +128,7 @@ upgradeHandler.init=Connection [{0}], Etat [{1}]
 upgradeHandler.initialWindowSize.invalid=Connection [{0}], La valeur [{1}] 
initiale de la taille de fenêtre est invalide
 upgradeHandler.invalidPreface=Connection [{0}], Préface de connection invalide
 upgradeHandler.ioerror=Connection [{0}]
+upgradeHandler.noAllocation=Connection [{0}], Flux [{1}], Temps d''attente 
maximum dépassé lors de l''allocation
 upgradeHandler.noNewStreams=Connection [{0}], Flux [{1}], Flux ignoré car 
aucun nouveau flux n''est autorisé sur cette connection
 upgradeHandler.notify=Connection [{0}], Flux [{1}], notify() appelé pour 
désallouer StreamOutputBuffer
 upgradeHandler.pause.entry=Connection [{0}] mise en pause
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_fr.properties 
b/java/org/apache/tomcat/util/http/LocalStrings_fr.properties
index d073209..32ce404 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_fr.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_fr.properties
@@ -16,6 +16,7 @@
 cookies.fallToDebug=\n\
 Note: toutes les occurrences suivantes d'erreurs de cookies seront 
enregistrées au niveau DEBUG
 cookies.invalidCookieToken=Cookie non valide. Sa valeur n'est ni un "token" ni 
une valeur entre guillemets
+cookies.invalidSameSiteCookies=Valeur inconnue [{0}], elle doit être parmi: 
none, lax, strict, la valeur par défaut est none
 cookies.invalidSpecial=Cookie spécial

[tomcat] 03/03: More German translations

2019-05-28 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 3c6c210ca722dbe5f096a674456b2833fa8f4660
Author: Mark Thomas 
AuthorDate: Tue May 28 12:55:22 2019 +0100

More German translations
---
 java/org/apache/catalina/deploy/LocalStrings_de.properties  | 1 +
 java/org/apache/catalina/manager/LocalStrings_de.properties | 4 ++--
 java/org/apache/coyote/LocalStrings_de.properties   | 1 +
 java/org/apache/coyote/http2/LocalStrings_de.properties | 3 +++
 java/org/apache/tomcat/util/http/LocalStrings_de.properties | 1 +
 java/org/apache/tomcat/util/net/LocalStrings_de.properties  | 1 +
 webapps/docs/changelog.xml  | 4 ++--
 7 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/java/org/apache/catalina/deploy/LocalStrings_de.properties 
b/java/org/apache/catalina/deploy/LocalStrings_de.properties
index df111e8..935232c 100644
--- a/java/org/apache/catalina/deploy/LocalStrings_de.properties
+++ b/java/org/apache/catalina/deploy/LocalStrings_de.properties
@@ -14,3 +14,4 @@
 # limitations under the License.
 
 namingResources.cleanupCloseSecurity=Kann Methode [{0}] für Ressource [{1}] in 
Container [{2}] nicht laden. Daher wird diese Ressource nicht aufgeräumt.
+namingResources.ejbLookupLink=Die EJB Referenz [{0}] spezifiziert beides, 
einen ejb-link und einen lookup-name
diff --git a/java/org/apache/catalina/manager/LocalStrings_de.properties 
b/java/org/apache/catalina/manager/LocalStrings_de.properties
index da0068d..21eb39d 100644
--- a/java/org/apache/catalina/manager/LocalStrings_de.properties
+++ b/java/org/apache/catalina/manager/LocalStrings_de.properties
@@ -83,8 +83,8 @@ managerServlet.resourcesType=OK - Auflistung globaler 
Ressourcen von Typ [{0}]
 managerServlet.saveFail=FEHLER - Speichern der Konfiguration fehlgeschlagen: 
[{0}]
 managerServlet.sessiondefaultmax=Voreingestellter Sitzungsablauf nach maximal 
[{0}] Minuten Inaktivität
 managerServlet.sessions=OK - Sitzungs-Informationen für Anwendung mit Kontext 
Pfad [{0}]
-managerServlet.sessiontimeout=[{0}] Minuten: [{1}] Sitzungen
-managerServlet.sessiontimeout.expired=[{0}] Minuten: expired [{1}] Sitzungen
+managerServlet.sessiontimeout=Inaktiv für [{0}] Minuten: [{1}] Sitzungen
+managerServlet.sessiontimeout.expired=Inaktiv für [{0}] Minuten: [{1}] 
Sitzungen sind abgelaufen
 managerServlet.sessiontimeout.unlimited=unlimited Minuten: [{0}] Sitzungen
 managerServlet.startFailed=FEHLER - Anwendung mit Kontext Pfad [{0}] konnte 
nicht gestartet werden
 managerServlet.started=OK - Anwendung mit Kontext Pfad [{0}] gestartet
diff --git a/java/org/apache/coyote/LocalStrings_de.properties 
b/java/org/apache/coyote/LocalStrings_de.properties
index dc66652..1b66a7a 100644
--- a/java/org/apache/coyote/LocalStrings_de.properties
+++ b/java/org/apache/coyote/LocalStrings_de.properties
@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+abstractConnectionHandler.oome=Verarbeitung der Anfrage fehlgeschlagen
 abstractConnectionHandler.processorPop=Prozessor [{0}] wurde aus dem Cache 
genommen.
 abstractConnectionHandler.socketexception.debug=SocketExceptions sind normal, 
werden ignoriert
 
diff --git a/java/org/apache/coyote/http2/LocalStrings_de.properties 
b/java/org/apache/coyote/http2/LocalStrings_de.properties
index 1ff6883..d4d6c97 100644
--- a/java/org/apache/coyote/http2/LocalStrings_de.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_de.properties
@@ -22,6 +22,9 @@ connectionSettings.headerTableSizeLimit=Verbindung [{0}], 
versuchte die Kopfzeil
 
 hpack.invalidCharacter=Das Unicode Zeichen [{0}] an Code Punkt [{1}] kann 
nicht kodiert werden, da es außerhalb des erlaubten Bereiches von 0 bis 255 ist.
 
+hpackdecoder.maxMemorySizeExceeded=Die header table Größe [{0}] überschreitet 
die maximale Größe von [{1}]
+hpackdecoder.nullHeader=Null header bei Index [{0}]
+
 http2Parser.headerLimitSize=Verbindung [{0}], Stream [{1}], 
Gesamt-Header-Größe zu groß
 http2Parser.processFrameData.window=Verbindung [{0}], Client hat mehr Daten 
gesendet als das Stream-Fenster zulässt
 http2Parser.processFrameHeaders.decodingDataLeft=Nach der HPACK-Dekodierung 
sind noch Daten übrig - die hätten verarbeitet sein sollen
diff --git a/java/org/apache/tomcat/util/http/LocalStrings_de.properties 
b/java/org/apache/tomcat/util/http/LocalStrings_de.properties
index 86f1512..829e61c 100644
--- a/java/org/apache/tomcat/util/http/LocalStrings_de.properties
+++ b/java/org/apache/tomcat/util/http/LocalStrings_de.properties
@@ -14,6 +14,7 @@
 # limitations under the License.
 
 cookies.invalidCookieToken=Cookies: Ungültiges Cookie. Wert ist kein Token 
oder Quoted Token
+cookies.invalidSameSiteCookies=Unbekannte Einstellung [{0}], Sollte einer der 
Werte: ''none'', ''lax'', ''strict'' entsprechen. Standardwert ist ''none''

[tomcat] 02/03: Expand the coverage and quality of the Simplified Chinese translations.

2019-05-28 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 76f9008f48e34dff7fa45f92a32c3035d4f1a637
Author: Mark Thomas 
AuthorDate: Tue May 28 12:48:56 2019 +0100

Expand the coverage and quality of the Simplified Chinese translations.

Includes contributions by 諵.
---
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties | 2 ++
 webapps/docs/changelog.xml | 4 
 2 files changed, 6 insertions(+)

diff --git a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties 
b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
index a740553..7ad2628 100644
--- a/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
+++ b/java/org/apache/coyote/http2/LocalStrings_zh_CN.properties
@@ -25,6 +25,7 @@ hpack.invalidCharacter=代码点[{1}]处的Unicode字符[{0}]无法编码，因
 
 hpackdecoder.tableSizeUpdateNotAtStart=任何表大小的更新都必须在头块开始时发送。
 
+http2Parser.error=连接到[{0}]，Stream [{1}], 框架类型 [{2}], 错误
 http2Parser.headers.wrongStream=连接[{0}], 头部信息对于流[{1}]正在进行但对于流[{2}]的一帧已经收到了。
 http2Parser.nonZeroPadding=连接[{0}]，流[{1}]，非零填充
 http2Parser.processFrameData.window=连接[{0}]，客户端发送的数据比流窗口允许的多
@@ -37,6 +38,7 @@ stream.inputBuffer.readTimeout=等待从客户端读取数据超时
 stream.inputBuffer.reset=流.重置
 stream.writeTimeout=等待客户端增加流控制窗口以允许写入流数据的超时
 
+streamProcessor.cancel=连接到[{0}]，Stream [{1}]，
 streamProcessor.service.error=请求处理期间出错
 
 streamStateMachine.invalidReset=连接[{0}]，流[{1}]，状态[{2}]，在这种状态下不允许重置
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 10ce759..b72da4c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -234,6 +234,10 @@
 Expand the coverage and quality of the French translations provided
 with Apache Tomcat. (remm)
   
+  
+Expand the coverage and quality of the Simplified Chinese translations
+provided with Apache Tomcat. Includes contributions by 諵. (markt)
+  
 
   
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated (003e071 -> 3c6c210)

2019-05-28 Thread markt 
This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 003e071  Add default instance manager factory method
 new fce0e0c  Expand the coverage and quality of the French translations 
(remm)
 new 76f9008  Expand the coverage and quality of the Simplified Chinese 
translations.
 new 3c6c210  More German translations

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 java/org/apache/catalina/deploy/LocalStrings_de.properties  |  1 +
 java/org/apache/catalina/manager/LocalStrings_de.properties |  4 ++--
 java/org/apache/coyote/LocalStrings_de.properties   |  1 +
 java/org/apache/coyote/LocalStrings_fr.properties   |  1 +
 java/org/apache/coyote/http2/LocalStrings_de.properties |  3 +++
 java/org/apache/coyote/http2/LocalStrings_fr.properties |  4 
 java/org/apache/coyote/http2/LocalStrings_zh_CN.properties  |  2 ++
 java/org/apache/tomcat/util/http/LocalStrings_de.properties |  1 +
 java/org/apache/tomcat/util/http/LocalStrings_fr.properties |  1 +
 java/org/apache/tomcat/util/net/LocalStrings_de.properties  |  1 +
 webapps/docs/changelog.xml  | 12 ++--
 11 files changed, 27 insertions(+), 4 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [Bug 43548] xml schema for tomcat-users.xml

2019-05-28 Thread Mark Thomas 
> Mark,
> 
> On 5/23/19 17:09, bugzi...@apache.org wrote:
>> https://bz.apache.org/bugzilla/show_bug.cgi?id=43548
> 
>> --- Comment #11 from Mark Thomas  --- Five years
>> on and I changed my mind. I've added this to 7.0.x for 7.0.95 
>> onwards.
> 
> Looking at this bug, I can see a link to the XSD for the tomcat-users
> files. Unfortunately, it points to the svn repository which has been
> removed/renamed.
> 
> Would it be possible to provide intelligent redirects to keep old
> links working?

That would be a question for infra but there are disadvantages as well
as advantages to doing that.

One of the advantages of moving the code to the archive folder is that
it breaks existing checkouts which prevents accidental commits to code
that is no longer being worked on.

If we did add such redirects, I'd suggest making the archive read-only
apart from svn admins.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org