[GitHub] [tomcat] markt-asf merged pull request #457: MimeHeader.toString to speed up debugging in IDEs

2021-11-04 Thread GitBox


markt-asf merged pull request #457:
URL: https://github.com/apache/tomcat/pull/457


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



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



[tomcat] branch main updated: MimeHeader.toString to speed up debugging in IDEs (#457)

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 74bafa3  MimeHeader.toString to speed up debugging in IDEs (#457)
74bafa3 is described below

commit 74bafa3c9dd55b131b6b66094c1a20e2afaba496
Author: David Blevins 
AuthorDate: Thu Nov 4 03:35:48 2021 -0700

MimeHeader.toString to speed up debugging in IDEs (#457)

#457 MimeHeader.toString to speed up debugging in IDEs

Co-authored-by: Mark Thomas 
---
 java/org/apache/tomcat/util/http/MimeHeaders.java | 5 +
 webapps/docs/changelog.xml| 4 
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java 
b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 2396c45..838ac61 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -539,4 +539,9 @@ class MimeHeaderField {
 public MessageBytes getValue() {
 return valueB;
 }
+
+@Override
+public String toString() {
+return nameB + ": " + valueB;
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 691cd55..0a5ca02 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -155,6 +155,10 @@
 Improve performance of Connector shutdown - primarily to reduce the 
time
 it takes to run the test suite. (markt)
   
+  
+457: Add a toString() method to
+MimeHeader to aid debugging. (dblevins)
+  
 
   
   

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



[tomcat] branch 10.0.x updated: MimeHeader.toString to speed up debugging in IDEs (#457)

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 442f7a2  MimeHeader.toString to speed up debugging in IDEs (#457)
442f7a2 is described below

commit 442f7a27c6f6b722dc1718f0bd3cc5b87595bf84
Author: David Blevins 
AuthorDate: Thu Nov 4 03:35:48 2021 -0700

MimeHeader.toString to speed up debugging in IDEs (#457)

Co-authored-by: Mark Thomas 
---
 java/org/apache/tomcat/util/http/MimeHeaders.java | 5 +
 webapps/docs/changelog.xml| 4 
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java 
b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 2396c45..838ac61 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -539,4 +539,9 @@ class MimeHeaderField {
 public MessageBytes getValue() {
 return valueB;
 }
+
+@Override
+public String toString() {
+return nameB + ": " + valueB;
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 5d26791..49f0bf8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,10 @@
 Refactor the APR/native connector shutdown to reduce the possibility of
 a JVM crash during the connector shutdown. (markt)
   
+  
+457: Add a toString() method to
+MimeHeader to aid debugging. (dblevins)
+  
 
   
   

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



[tomcat] branch 9.0.x updated: MimeHeader.toString to speed up debugging in IDEs (#457)

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new a7fa1e7  MimeHeader.toString to speed up debugging in IDEs (#457)
a7fa1e7 is described below

commit a7fa1e75fc9ff66195524af2d9f99adae5cc9200
Author: David Blevins 
AuthorDate: Thu Nov 4 03:35:48 2021 -0700

MimeHeader.toString to speed up debugging in IDEs (#457)

Co-authored-by: Mark Thomas 
---
 java/org/apache/tomcat/util/http/MimeHeaders.java | 5 +
 webapps/docs/changelog.xml| 4 
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java 
b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 2396c45..838ac61 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -539,4 +539,9 @@ class MimeHeaderField {
 public MessageBytes getValue() {
 return valueB;
 }
+
+@Override
+public String toString() {
+return nameB + ": " + valueB;
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 3e674a9..6012049 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -128,6 +128,10 @@
 Refactor the APR/native connector shutdown to reduce the possibility of
 a JVM crash during the connector shutdown. (markt)
   
+  
+457: Add a toString() method to
+MimeHeader to aid debugging. (dblevins)
+  
 
   
   

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



[tomcat] branch 8.5.x updated: MimeHeader.toString to speed up debugging in IDEs (#457)

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/8.5.x by this push:
 new fce3dc1  MimeHeader.toString to speed up debugging in IDEs (#457)
fce3dc1 is described below

commit fce3dc1fcc733d01435e394fff57e21007d62426
Author: David Blevins 
AuthorDate: Thu Nov 4 03:35:48 2021 -0700

MimeHeader.toString to speed up debugging in IDEs (#457)

Co-authored-by: Mark Thomas 
---
 java/org/apache/tomcat/util/http/MimeHeaders.java | 5 +
 webapps/docs/changelog.xml| 4 
 2 files changed, 9 insertions(+)

diff --git a/java/org/apache/tomcat/util/http/MimeHeaders.java 
b/java/org/apache/tomcat/util/http/MimeHeaders.java
index 2396c45..838ac61 100644
--- a/java/org/apache/tomcat/util/http/MimeHeaders.java
+++ b/java/org/apache/tomcat/util/http/MimeHeaders.java
@@ -539,4 +539,9 @@ class MimeHeaderField {
 public MessageBytes getValue() {
 return valueB;
 }
+
+@Override
+public String toString() {
+return nameB + ": " + valueB;
+}
 }
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 0dcbed0..5d72085 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -124,6 +124,10 @@
 Improve performance of Connector shutdown - primarily to reduce the 
time
 it takes to run the test suite. (markt)
   
+  
+457: Add a toString() method to
+MimeHeader to aid debugging. (dblevins)
+  
 
   
   

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



[tomcat] branch main updated: Provide a little more control over resource caching

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new c985ecf  Provide a little more control over resource caching
c985ecf is described below

commit c985ecf350ed682ed69a1512eea7294ab38dbeb5
Author: Mark Thomas 
AuthorDate: Thu Nov 4 10:52:06 2021 +

Provide a little more control over resource caching
---
 java/org/apache/catalina/WebResourceRoot.java  | 44 ++
 .../apache/catalina/startup/ContextRuleSet.java|  8 
 java/org/apache/catalina/webresources/Cache.java   | 17 +
 .../catalina/webresources/MyCacheStrategy.java | 29 ++
 .../apache/catalina/webresources/StandardRoot.java | 11 ++
 webapps/docs/changelog.xml |  5 +++
 6 files changed, 114 insertions(+)

diff --git a/java/org/apache/catalina/WebResourceRoot.java 
b/java/org/apache/catalina/WebResourceRoot.java
index 8d8092a..ae37893 100644
--- a/java/org/apache/catalina/WebResourceRoot.java
+++ b/java/org/apache/catalina/WebResourceRoot.java
@@ -431,10 +431,54 @@ public interface WebResourceRoot extends Lifecycle {
  */
 void gc();
 
+/**
+ * Obtain the current caching strategy.
+ * 
+ * The default implementation returns {@code null}. Sub-classes wishing to
+ * utilise a {@link CacheStrategy} should provide an appropriate
+ * implementation.
+ *
+ * @return the current caching strategy or {@code null} if no strategy has
+ * been configured
+ */
+default CacheStrategy getCacheStrategy() {
+return null;
+}
+
+/**
+ * Set the current caching strategy.
+ * 
+ * The default implementation is a NO-OP. Sub-classes wishing to utilise a
+ * {@link CacheStrategy} should provide an appropriate implementation.
+ *
+ * @param strategy The new strategy to use or {@code null} for no strategy
+ */
+default void setCacheStrategy(CacheStrategy strategy) {
+// NO-OP
+}
+
 enum ResourceSetType {
 PRE,
 RESOURCE_JAR,
 POST,
 CLASSES_JAR
 }
+
+/**
+ * Provides a mechanism to modify the caching behaviour.
+ */
+interface CacheStrategy {
+
+/**
+ * Should the result of looking up the resource at the given path be
+ * excluded from caching?
+ *
+ * @param path  The path to check against the strategy to see if the
+ *  result should be cached
+ *
+ * @return {@code true} if the result should not be cached, otherwise
+ * {@code false}
+ */
+boolean noCache(String path);
+}
 }
diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java 
b/java/org/apache/catalina/startup/ContextRuleSet.java
index e230d54..4aa081e 100644
--- a/java/org/apache/catalina/startup/ContextRuleSet.java
+++ b/java/org/apache/catalina/startup/ContextRuleSet.java
@@ -168,6 +168,14 @@ public class ContextRuleSet implements RuleSet {
 "setResources",
 "org.apache.catalina.WebResourceRoot");
 
+digester.addObjectCreate(prefix + "Context/Resources/CacheStrategy",
+ null, // MUST be specified in the element
+ "className");
+digester.addSetProperties(prefix + "Context/Resources/CacheStrategy");
+digester.addSetNext(prefix + "Context/Resources/CacheStrategy",
+"setCacheStrategy",
+
"org.apache.catalina.WebResourceRoot$CacheStrategy");
+
 digester.addObjectCreate(prefix + "Context/Resources/PreResources",
  null, // MUST be specified in the element
  "className");
diff --git a/java/org/apache/catalina/webresources/Cache.java 
b/java/org/apache/catalina/webresources/Cache.java
index b2ce23c..bf762d4 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.catalina.WebResource;
+import org.apache.catalina.WebResourceRoot.CacheStrategy;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.res.StringManager;
@@ -45,6 +46,7 @@ public class Cache {
 private long ttl = 5000;
 private long maxSize = 10 * 1024 * 1024;
 private int objectMaxSize = (int) maxSize/OBJECT_MAX_SIZE_FACTOR;
+private CacheStrategy cacheStrategy;
 
 private AtomicLong lookupCount = new AtomicLong(0);
 private AtomicLong hitCount = new AtomicLong(0);
@@ -62,6 +64,13 @@ public class Cache {
 return root.getResourceInternal(path, useClassL

[tomcat] branch 10.0.x updated: Provide a little more control over resource caching

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/10.0.x by this push:
 new 9425968  Provide a little more control over resource caching
9425968 is described below

commit 9425968c6a94cb85ec8e748cd16cc3e591040ab4
Author: Mark Thomas 
AuthorDate: Thu Nov 4 10:52:06 2021 +

Provide a little more control over resource caching
---
 java/org/apache/catalina/WebResourceRoot.java  | 44 ++
 .../apache/catalina/startup/ContextRuleSet.java|  8 
 java/org/apache/catalina/webresources/Cache.java   | 17 +
 .../catalina/webresources/MyCacheStrategy.java | 29 ++
 .../apache/catalina/webresources/StandardRoot.java | 11 ++
 webapps/docs/changelog.xml |  5 +++
 6 files changed, 114 insertions(+)

diff --git a/java/org/apache/catalina/WebResourceRoot.java 
b/java/org/apache/catalina/WebResourceRoot.java
index 8d8092a..ae37893 100644
--- a/java/org/apache/catalina/WebResourceRoot.java
+++ b/java/org/apache/catalina/WebResourceRoot.java
@@ -431,10 +431,54 @@ public interface WebResourceRoot extends Lifecycle {
  */
 void gc();
 
+/**
+ * Obtain the current caching strategy.
+ * 
+ * The default implementation returns {@code null}. Sub-classes wishing to
+ * utilise a {@link CacheStrategy} should provide an appropriate
+ * implementation.
+ *
+ * @return the current caching strategy or {@code null} if no strategy has
+ * been configured
+ */
+default CacheStrategy getCacheStrategy() {
+return null;
+}
+
+/**
+ * Set the current caching strategy.
+ * 
+ * The default implementation is a NO-OP. Sub-classes wishing to utilise a
+ * {@link CacheStrategy} should provide an appropriate implementation.
+ *
+ * @param strategy The new strategy to use or {@code null} for no strategy
+ */
+default void setCacheStrategy(CacheStrategy strategy) {
+// NO-OP
+}
+
 enum ResourceSetType {
 PRE,
 RESOURCE_JAR,
 POST,
 CLASSES_JAR
 }
+
+/**
+ * Provides a mechanism to modify the caching behaviour.
+ */
+interface CacheStrategy {
+
+/**
+ * Should the result of looking up the resource at the given path be
+ * excluded from caching?
+ *
+ * @param path  The path to check against the strategy to see if the
+ *  result should be cached
+ *
+ * @return {@code true} if the result should not be cached, otherwise
+ * {@code false}
+ */
+boolean noCache(String path);
+}
 }
diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java 
b/java/org/apache/catalina/startup/ContextRuleSet.java
index e230d54..4aa081e 100644
--- a/java/org/apache/catalina/startup/ContextRuleSet.java
+++ b/java/org/apache/catalina/startup/ContextRuleSet.java
@@ -168,6 +168,14 @@ public class ContextRuleSet implements RuleSet {
 "setResources",
 "org.apache.catalina.WebResourceRoot");
 
+digester.addObjectCreate(prefix + "Context/Resources/CacheStrategy",
+ null, // MUST be specified in the element
+ "className");
+digester.addSetProperties(prefix + "Context/Resources/CacheStrategy");
+digester.addSetNext(prefix + "Context/Resources/CacheStrategy",
+"setCacheStrategy",
+
"org.apache.catalina.WebResourceRoot$CacheStrategy");
+
 digester.addObjectCreate(prefix + "Context/Resources/PreResources",
  null, // MUST be specified in the element
  "className");
diff --git a/java/org/apache/catalina/webresources/Cache.java 
b/java/org/apache/catalina/webresources/Cache.java
index b2ce23c..bf762d4 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.catalina.WebResource;
+import org.apache.catalina.WebResourceRoot.CacheStrategy;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.res.StringManager;
@@ -45,6 +46,7 @@ public class Cache {
 private long ttl = 5000;
 private long maxSize = 10 * 1024 * 1024;
 private int objectMaxSize = (int) maxSize/OBJECT_MAX_SIZE_FACTOR;
+private CacheStrategy cacheStrategy;
 
 private AtomicLong lookupCount = new AtomicLong(0);
 private AtomicLong hitCount = new AtomicLong(0);
@@ -62,6 +64,13 @@ public class Cache {
 return root.getResourceInternal(path, useCl

[tomcat] branch 9.0.x updated: Provide a little more control over resource caching

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 9cf432c  Provide a little more control over resource caching
9cf432c is described below

commit 9cf432cecde096f10ea19ff78d49b03307f85099
Author: Mark Thomas 
AuthorDate: Thu Nov 4 10:52:06 2021 +

Provide a little more control over resource caching
---
 java/org/apache/catalina/WebResourceRoot.java  | 44 ++
 .../apache/catalina/startup/ContextRuleSet.java|  8 
 java/org/apache/catalina/webresources/Cache.java   | 17 +
 .../catalina/webresources/MyCacheStrategy.java | 29 ++
 .../apache/catalina/webresources/StandardRoot.java | 11 ++
 webapps/docs/changelog.xml |  5 +++
 6 files changed, 114 insertions(+)

diff --git a/java/org/apache/catalina/WebResourceRoot.java 
b/java/org/apache/catalina/WebResourceRoot.java
index 8d8092a..ae37893 100644
--- a/java/org/apache/catalina/WebResourceRoot.java
+++ b/java/org/apache/catalina/WebResourceRoot.java
@@ -431,10 +431,54 @@ public interface WebResourceRoot extends Lifecycle {
  */
 void gc();
 
+/**
+ * Obtain the current caching strategy.
+ * 
+ * The default implementation returns {@code null}. Sub-classes wishing to
+ * utilise a {@link CacheStrategy} should provide an appropriate
+ * implementation.
+ *
+ * @return the current caching strategy or {@code null} if no strategy has
+ * been configured
+ */
+default CacheStrategy getCacheStrategy() {
+return null;
+}
+
+/**
+ * Set the current caching strategy.
+ * 
+ * The default implementation is a NO-OP. Sub-classes wishing to utilise a
+ * {@link CacheStrategy} should provide an appropriate implementation.
+ *
+ * @param strategy The new strategy to use or {@code null} for no strategy
+ */
+default void setCacheStrategy(CacheStrategy strategy) {
+// NO-OP
+}
+
 enum ResourceSetType {
 PRE,
 RESOURCE_JAR,
 POST,
 CLASSES_JAR
 }
+
+/**
+ * Provides a mechanism to modify the caching behaviour.
+ */
+interface CacheStrategy {
+
+/**
+ * Should the result of looking up the resource at the given path be
+ * excluded from caching?
+ *
+ * @param path  The path to check against the strategy to see if the
+ *  result should be cached
+ *
+ * @return {@code true} if the result should not be cached, otherwise
+ * {@code false}
+ */
+boolean noCache(String path);
+}
 }
diff --git a/java/org/apache/catalina/startup/ContextRuleSet.java 
b/java/org/apache/catalina/startup/ContextRuleSet.java
index e230d54..4aa081e 100644
--- a/java/org/apache/catalina/startup/ContextRuleSet.java
+++ b/java/org/apache/catalina/startup/ContextRuleSet.java
@@ -168,6 +168,14 @@ public class ContextRuleSet implements RuleSet {
 "setResources",
 "org.apache.catalina.WebResourceRoot");
 
+digester.addObjectCreate(prefix + "Context/Resources/CacheStrategy",
+ null, // MUST be specified in the element
+ "className");
+digester.addSetProperties(prefix + "Context/Resources/CacheStrategy");
+digester.addSetNext(prefix + "Context/Resources/CacheStrategy",
+"setCacheStrategy",
+
"org.apache.catalina.WebResourceRoot$CacheStrategy");
+
 digester.addObjectCreate(prefix + "Context/Resources/PreResources",
  null, // MUST be specified in the element
  "className");
diff --git a/java/org/apache/catalina/webresources/Cache.java 
b/java/org/apache/catalina/webresources/Cache.java
index b2ce23c..bf762d4 100644
--- a/java/org/apache/catalina/webresources/Cache.java
+++ b/java/org/apache/catalina/webresources/Cache.java
@@ -24,6 +24,7 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.atomic.AtomicLong;
 
 import org.apache.catalina.WebResource;
+import org.apache.catalina.WebResourceRoot.CacheStrategy;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
 import org.apache.tomcat.util.res.StringManager;
@@ -45,6 +46,7 @@ public class Cache {
 private long ttl = 5000;
 private long maxSize = 10 * 1024 * 1024;
 private int objectMaxSize = (int) maxSize/OBJECT_MAX_SIZE_FACTOR;
+private CacheStrategy cacheStrategy;
 
 private AtomicLong lookupCount = new AtomicLong(0);
 private AtomicLong hitCount = new AtomicLong(0);
@@ -62,6 +64,13 @@ public class Cache {
 return root.getResourceInternal(path, useClas

Re: [tomcat] branch 9.0.x updated: Provide a little more control over resource caching

2021-11-04 Thread Mark Thomas

On 04/11/2021 10:53, ma...@apache.org wrote:

This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/9.0.x by this push:
  new 9cf432c  Provide a little more control over resource caching
9cf432c is described below

commit 9cf432cecde096f10ea19ff78d49b03307f85099
Author: Mark Thomas 
AuthorDate: Thu Nov 4 10:52:06 2021 +

 Provide a little more control over resource caching


Do we want to back-port this to 8.5.x? Because we can't use default 
methods it will break any custom WebResourceRoot implementations.


Mark

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



Typo on Which Version? page?

2021-11-04 Thread Christopher Schultz

All,

I was just looking at the Which Version? page and I may have missed 
something: do we support "JASIC" or "JASPIC"? Or is it "Jakarta 
Authentication," now?


A Google search doesn't bring-up much in the way of results for JASIC 
other than an OAuth implementation.


-chris

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



Re: Typo on Which Version? page?

2021-11-04 Thread Mark Thomas

On 04/11/2021 14:31, Christopher Schultz wrote:

All,

I was just looking at the Which Version? page and I may have missed 
something: do we support "JASIC" or "JASPIC"?


JASPIC.


Or is it "Jakarta Authentication," now?


It is.

We probably need to figure out a way to list the old and new spec names 
on that page.


Mark



A Google search doesn't bring-up much in the way of results for JASIC 
other than an OAuth implementation.


-chris

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




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



[tomcat] branch main updated: Update remaining spec versions for Jakarta EE 10

2021-11-04 Thread markt
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 8febf73  Update remaining spec versions for Jakarta EE 10
8febf73 is described below

commit 8febf73f8caf198ffdf7987138fcbe13b62140e3
Author: Mark Thomas 
AuthorDate: Thu Nov 4 17:47:09 2021 +

Update remaining spec versions for Jakarta EE 10
---
 build.xml | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/build.xml b/build.xml
index d010a4d..df0181a 100644
--- a/build.xml
+++ b/build.xml
@@ -58,12 +58,12 @@
   
   
   
-  
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
 
   
   

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



svn commit: r1894737 - in /tomcat/site/trunk: docs/whichversion.html xdocs/whichversion.xml

2021-11-04 Thread markt
Author: markt
Date: Thu Nov  4 17:49:58 2021
New Revision: 1894737

URL: http://svn.apache.org/viewvc?rev=1894737&view=rev
Log:
Update spec versions for Tomact 10.1

Modified:
tomcat/site/trunk/docs/whichversion.html
tomcat/site/trunk/xdocs/whichversion.xml

Modified: tomcat/site/trunk/docs/whichversion.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1894737&r1=1894736&r2=1894737&view=diff
==
--- tomcat/site/trunk/docs/whichversion.html (original)
+++ tomcat/site/trunk/docs/whichversion.html Thu Nov  4 17:49:58 2021
@@ -17,7 +17,7 @@ specifications and the respective Ap
   JSP Spec
   EL Spec
   WebSocket Spec
-  Authentication (JASIC) Spec
+  Authentication (JASPIC) Spec
   Apache Tomcat Version
   Latest Released Version
   Supported Java Versions
@@ -27,8 +27,8 @@ specifications and the respective Ap
   6.0
   3.1
   5.0
-  TBD
-  TBD
+  2.1
+  3.0
   10.1.x
   10.1.0-M6 (alpha)
   11 and later

Modified: tomcat/site/trunk/xdocs/whichversion.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/whichversion.xml?rev=1894737&r1=1894736&r2=1894737&view=diff
==
--- tomcat/site/trunk/xdocs/whichversion.xml (original)
+++ tomcat/site/trunk/xdocs/whichversion.xml Thu Nov  4 17:49:58 2021
@@ -26,7 +26,7 @@ specifications and the respective Ap
   JSP Spec
   EL Spec
   WebSocket Spec
-  Authentication (JASIC) Spec
+  Authentication (JASPIC) Spec
   Apache Tomcat Version
   Latest Released Version
   Supported Java Versions
@@ -36,8 +36,8 @@ specifications and the respective Ap
   6.0
   3.1
   5.0
-  TBD
-  TBD
+  2.1
+  3.0
   10.1.x
   10.1.0-M6 (alpha)
   11 and later



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



[tomcat] branch main updated: Update instructions

2021-11-04 Thread remm
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
 new 8f93066  Update instructions
8f93066 is described below

commit 8f93066a694221255e08c0a58dcf66367a5323b0
Author: remm 
AuthorDate: Thu Nov 4 22:50:40 2021 +0100

Update instructions

Following an ill fated Fedora update, I ran into problems where jextract
would fail. It turned out to be caused by a Clang update. Documenting
what should be done and which version works.
---
 modules/openssl-panama-foreign/README.md | 4 
 1 file changed, 4 insertions(+)

diff --git a/modules/openssl-panama-foreign/README.md 
b/modules/openssl-panama-foreign/README.md
index 1e4f72f..d03fa38 100644
--- a/modules/openssl-panama-foreign/README.md
+++ b/modules/openssl-panama-foreign/README.md
@@ -14,6 +14,10 @@ it does. This is the only way to obtain the jextract tool, 
that is more or less
 required for large libraries. The Panama API from this branch is also
 different from the API present in Java 17.
 
+Clang is a dependency for jextract, and ideally Clang from LLVM 12 should be
+used. It may need explicit declaration to the configure script, using something
+like `--with-libclang=/usr/lib64/llvm12 --with-libclang-version=12`.
+
 ```
 bash configure
 make images

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