buildbot success in on tomcat-trunk
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/5475 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] a0fb5f4b42c593fa566878dddfa213e5f3c9c499 Blamelist: Igal Sapir 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: Added Javadoc comments for Java 15
This is an automated email from the ASF dual-hosted git repository. isapir 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 a0fb5f4 Added Javadoc comments for Java 15 a0fb5f4 is described below commit a0fb5f4b42c593fa566878dddfa213e5f3c9c499 Author: Igal Sapir AuthorDate: Sat Oct 3 13:53:51 2020 -0700 Added Javadoc comments for Java 15 --- java/jakarta/servlet/FilterRegistration.java | 19 +++ java/jakarta/servlet/GenericFilter.java | 7 ++ java/jakarta/servlet/Registration.java| 5 java/jakarta/servlet/ServletRegistration.java | 34 +++ 4 files changed, 55 insertions(+), 10 deletions(-) diff --git a/java/jakarta/servlet/FilterRegistration.java b/java/jakarta/servlet/FilterRegistration.java index 0516459..d2c8354 100644 --- a/java/jakarta/servlet/FilterRegistration.java +++ b/java/jakarta/servlet/FilterRegistration.java @@ -20,8 +20,9 @@ import java.util.Collection; import java.util.EnumSet; /** + * Interface through which a Filter may be further configured. + * * @since Servlet 3.0 - * TODO SERVLET3 - Add comments */ public interface FilterRegistration extends Registration { @@ -43,9 +44,12 @@ public interface FilterRegistration extends Registration { public void addMappingForServletNames( EnumSet dispatcherTypes, boolean isMatchAfter, String... servletNames); + /** + * Gets the currently available servlet name mappings of the Filter + * represented by this FilterRegistration. * - * @return TODO + * @return a Collection of the Servlet name mappings */ public Collection getServletNameMappings(); @@ -69,13 +73,18 @@ public interface FilterRegistration extends Registration { boolean isMatchAfter, String... urlPatterns); /** + * Gets the currently available URL pattern mappings of the Filter + * represented by this FilterRegistration. * - * @return TODO + * @return a Collection of the URL pattern mappings */ public Collection getUrlPatternMappings(); -public static interface Dynamic -extends FilterRegistration, Registration.Dynamic { +/** + * Interface through which a Filter registered via one of the addFilter + * methods on ServletContext may be further configured. + */ +public static interface Dynamic extends FilterRegistration, Registration.Dynamic { // No additional methods } } diff --git a/java/jakarta/servlet/GenericFilter.java b/java/jakarta/servlet/GenericFilter.java index 7d999a5..f2585d0 100644 --- a/java/jakarta/servlet/GenericFilter.java +++ b/java/jakarta/servlet/GenericFilter.java @@ -19,6 +19,13 @@ package jakarta.servlet; import java.io.Serializable; import java.util.Enumeration; +/** + * Provides a base class the implements the Filter and FilterConfig interfaces + * to reduce boilerplate when writing new filters. + * + * @see jakarta.servlet.Filter + * @see jakarta.servlet.FilterConfig + */ public abstract class GenericFilter implements Filter, FilterConfig, Serializable { private static final long serialVersionUID = 1L; diff --git a/java/jakarta/servlet/Registration.java b/java/jakarta/servlet/Registration.java index c6c0de8..45f3934 100644 --- a/java/jakarta/servlet/Registration.java +++ b/java/jakarta/servlet/Registration.java @@ -78,6 +78,11 @@ public interface Registration { */ public Map getInitParameters(); +/** + * Interface through which a Servlet or Filter registered via one of the + * addServlet or addFilter methods, respectively, on ServletContext may be + * further configured. + */ public interface Dynamic extends Registration { /** diff --git a/java/jakarta/servlet/ServletRegistration.java b/java/jakarta/servlet/ServletRegistration.java index 5169f68..f78bde0 100644 --- a/java/jakarta/servlet/ServletRegistration.java +++ b/java/jakarta/servlet/ServletRegistration.java @@ -20,27 +20,51 @@ import java.util.Collection; import java.util.Set; /** - * TODO SERVLET3 - Add comments + * Interface through which a Servlet may be further configured. + * * @since Servlet 3.0 */ public interface ServletRegistration extends Registration { /** - * TODO + * Adds a servlet mapping with the given URL patterns for the Servlet + * represented by this ServletRegistration. If any of the specified URL + * patterns are already mapped to a different Servlet, no updates will + * be performed. + * + * If this method is called multiple times, each successive call adds to + * the effects of the former. The returned set is not backed by the + * ServletRegistration object, so changes in the returned set are not + * reflected in the ServletRegistration object, and vice-versa. + * * @param urlPatterns The URL
buildbot failure in on tomcat-trunk
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/5474 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 2eb0c0867fe99dc8ecba741534eb52cb823e3035 Blamelist: Igal Sapir 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
TCK status
Hi all, I mentioned TCK status during a couple of ApacheCon presentations. Having checked the current status I thought it would be worth sending a brief note to the list. More detail is on the wiki: https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs The short version is: - EL: all tests pass - JSP: all tests pass (once the TCK regression is fixed) - WebSocket: all tests pass - Servlet: one failure (expected) So, all good. No issues. Mark P.S. If you are wondering the servlet failure is because Tomcat ignores any suggested context path in web.xml and will ALWAYS derive the context path from the file name to avoid ambiguities and conflicts. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Whitespace police
This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 089a803c694a6f5365b8a9b75a0d7f0c36ebca1f Author: Igal Sapir AuthorDate: Sat Oct 3 11:32:53 2020 -0700 Whitespace police --- java/jakarta/annotation/Resource.java | 2 +- .../annotation/sql/DataSourceDefinition.java | 38 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java index 20cecab..746da43 100644 --- a/java/jakarta/annotation/Resource.java +++ b/java/jakarta/annotation/Resource.java @@ -46,7 +46,7 @@ public @interface Resource { * @return a String with the name of the resource */ public String name() default ""; - + /** * Uses generics since Common Annotations 1.2. * diff --git a/java/jakarta/annotation/sql/DataSourceDefinition.java b/java/jakarta/annotation/sql/DataSourceDefinition.java index e4de009..d93b920 100644 --- a/java/jakarta/annotation/sql/DataSourceDefinition.java +++ b/java/jakarta/annotation/sql/DataSourceDefinition.java @@ -27,95 +27,95 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DataSourceDefinition { - + /** * @return the className */ String className(); - + /** * @return the name */ String name(); - + /** * @return the description */ String description() default ""; - + /** * @return the url */ String url() default ""; - + /** * @return the user */ String user() default ""; - + /** * @return the password */ String password() default ""; - + /** * @return database name */ String databaseName() default ""; - + /** * @return the port number */ int portNumber() default -1; - + /** * @return the server name */ String serverName() default "localhost"; - + /** * @return the isolation level */ int isolationLevel() default -1; - + /** * @return true if the data source is transactional */ boolean transactional() default true; - + /** * @return the initial pool size */ int initialPoolSize() default -1; - + /** * @return the max pool size */ int maxPoolSize() default -1; - + /** * @return the min pool size */ int minPoolSize() default -1; - + /** * @return the max idle time */ int maxIdleTime() default -1; - + /** * @return the max statements */ int maxStatements() default -1; - + /** * @return a String[] with the properties */ String[] properties() default {}; - + /** * @return the login timeout */ int loginTimeout() default 0; - + } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Added Javadoc comments for Java 15
This is an automated email from the ASF dual-hosted git repository. isapir 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 a958f03 Added Javadoc comments for Java 15 a958f03 is described below commit a958f03ced5a533aec9ab9258459e3d81fd9f2b0 Author: Igal Sapir AuthorDate: Sat Oct 3 11:24:58 2020 -0700 Added Javadoc comments for Java 15 --- java/jakarta/annotation/Priority.java | 4 ++ java/jakarta/annotation/Resource.java | 32 ++ java/jakarta/annotation/Resources.java | 4 ++ java/jakarta/annotation/security/DeclareRoles.java | 4 ++ java/jakarta/annotation/security/RolesAllowed.java | 4 ++ java/jakarta/annotation/security/RunAs.java| 4 ++ .../annotation/sql/DataSourceDefinition.java | 73 ++ .../annotation/sql/DataSourceDefinitions.java | 4 ++ 8 files changed, 129 insertions(+) diff --git a/java/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java index f5b59c1..74dce8b 100644 --- a/java/jakarta/annotation/Priority.java +++ b/java/jakarta/annotation/Priority.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Priority { + +/** + * @return the int value + */ int value(); } diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java index 70b4d76..20cecab 100644 --- a/java/jakarta/annotation/Resource.java +++ b/java/jakarta/annotation/Resource.java @@ -27,21 +27,53 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface Resource { + +/** + * The AuthenticationType, either CONTAINER or APPLICATION + */ public enum AuthenticationType { +/** + * Container authentication + */ CONTAINER, +/** + * Application authentication + */ APPLICATION } + +/** + * @return a String with the name of the resource + */ public String name() default ""; + /** * Uses generics since Common Annotations 1.2. * * @return The type for instances of this resource */ public Class type() default Object.class; + +/** + * @return the AuthenticationType of the resource default CONTAINER + */ public AuthenticationType authenticationType() default AuthenticationType.CONTAINER; + +/** + * @return true (default) if the resource is shareable, or false if not + */ public boolean shareable() default true; + +/** + * @return a string with the description for the resource + */ public String description() default ""; + +/** + * @return a string with the mappedName of the resource + */ public String mappedName() default ""; + /** * @since Common Annotations 1.1 * diff --git a/java/jakarta/annotation/Resources.java b/java/jakarta/annotation/Resources.java index 12317ed..d595399 100644 --- a/java/jakarta/annotation/Resources.java +++ b/java/jakarta/annotation/Resources.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Resources { + +/** + * @return a Resource[] with the value of this Resources + */ public Resource[] value(); } diff --git a/java/jakarta/annotation/security/DeclareRoles.java b/java/jakarta/annotation/security/DeclareRoles.java index e0f93df..0f2eb21 100644 --- a/java/jakarta/annotation/security/DeclareRoles.java +++ b/java/jakarta/annotation/security/DeclareRoles.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DeclareRoles { + +/** + * @return a String[] with the roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RolesAllowed.java b/java/jakarta/annotation/security/RolesAllowed.java index 5c4d14f..9bb62b5 100644 --- a/java/jakarta/annotation/security/RolesAllowed.java +++ b/java/jakarta/annotation/security/RolesAllowed.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface RolesAllowed { + +/** + * @return a String[] of the allowed roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RunAs.java b/java/jakarta/annotation/security/RunAs.java index f980219..33fe276 100644 --- a/java/jakarta/annotation/security/RunAs.java +++ b/java/jakarta/annotation/security/RunAs.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface RunAs { + +
[tomcat] 01/02: Whitespace police
This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 089a803c694a6f5365b8a9b75a0d7f0c36ebca1f Author: Igal Sapir AuthorDate: Sat Oct 3 11:32:53 2020 -0700 Whitespace police --- java/jakarta/annotation/Resource.java | 2 +- .../annotation/sql/DataSourceDefinition.java | 38 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java index 20cecab..746da43 100644 --- a/java/jakarta/annotation/Resource.java +++ b/java/jakarta/annotation/Resource.java @@ -46,7 +46,7 @@ public @interface Resource { * @return a String with the name of the resource */ public String name() default ""; - + /** * Uses generics since Common Annotations 1.2. * diff --git a/java/jakarta/annotation/sql/DataSourceDefinition.java b/java/jakarta/annotation/sql/DataSourceDefinition.java index e4de009..d93b920 100644 --- a/java/jakarta/annotation/sql/DataSourceDefinition.java +++ b/java/jakarta/annotation/sql/DataSourceDefinition.java @@ -27,95 +27,95 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DataSourceDefinition { - + /** * @return the className */ String className(); - + /** * @return the name */ String name(); - + /** * @return the description */ String description() default ""; - + /** * @return the url */ String url() default ""; - + /** * @return the user */ String user() default ""; - + /** * @return the password */ String password() default ""; - + /** * @return database name */ String databaseName() default ""; - + /** * @return the port number */ int portNumber() default -1; - + /** * @return the server name */ String serverName() default "localhost"; - + /** * @return the isolation level */ int isolationLevel() default -1; - + /** * @return true if the data source is transactional */ boolean transactional() default true; - + /** * @return the initial pool size */ int initialPoolSize() default -1; - + /** * @return the max pool size */ int maxPoolSize() default -1; - + /** * @return the min pool size */ int minPoolSize() default -1; - + /** * @return the max idle time */ int maxIdleTime() default -1; - + /** * @return the max statements */ int maxStatements() default -1; - + /** * @return a String[] with the properties */ String[] properties() default {}; - + /** * @return the login timeout */ int loginTimeout() default 0; - + } - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated (a958f03 -> 2eb0c08)
This is an automated email from the ASF dual-hosted git repository. isapir pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from a958f03 Added Javadoc comments for Java 15 new 089a803 Whitespace police new 2eb0c08 Added .vscode to gitignore The 2 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: .gitignore | 1 + java/jakarta/annotation/Resource.java | 2 +- .../annotation/sql/DataSourceDefinition.java | 38 +++--- 3 files changed, 21 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Added .vscode to gitignore
This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 2eb0c0867fe99dc8ecba741534eb52cb823e3035 Author: Igal Sapir AuthorDate: Sat Oct 3 11:33:23 2020 -0700 Added .vscode to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index aa1345f..e2d604f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ mvn.properties .project .settings .idea +.vscode *.iml *.ipr *.iws - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 02/02: Added .vscode to gitignore
This is an automated email from the ASF dual-hosted git repository. isapir pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git commit 2eb0c0867fe99dc8ecba741534eb52cb823e3035 Author: Igal Sapir AuthorDate: Sat Oct 3 11:33:23 2020 -0700 Added .vscode to gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index aa1345f..e2d604f 100644 --- a/.gitignore +++ b/.gitignore @@ -30,6 +30,7 @@ mvn.properties .project .settings .idea +.vscode *.iml *.ipr *.iws - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Added Javadoc comments for Java 15
This is an automated email from the ASF dual-hosted git repository. isapir 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 a958f03 Added Javadoc comments for Java 15 a958f03 is described below commit a958f03ced5a533aec9ab9258459e3d81fd9f2b0 Author: Igal Sapir AuthorDate: Sat Oct 3 11:24:58 2020 -0700 Added Javadoc comments for Java 15 --- java/jakarta/annotation/Priority.java | 4 ++ java/jakarta/annotation/Resource.java | 32 ++ java/jakarta/annotation/Resources.java | 4 ++ java/jakarta/annotation/security/DeclareRoles.java | 4 ++ java/jakarta/annotation/security/RolesAllowed.java | 4 ++ java/jakarta/annotation/security/RunAs.java| 4 ++ .../annotation/sql/DataSourceDefinition.java | 73 ++ .../annotation/sql/DataSourceDefinitions.java | 4 ++ 8 files changed, 129 insertions(+) diff --git a/java/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java index f5b59c1..74dce8b 100644 --- a/java/jakarta/annotation/Priority.java +++ b/java/jakarta/annotation/Priority.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Priority { + +/** + * @return the int value + */ int value(); } diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java index 70b4d76..20cecab 100644 --- a/java/jakarta/annotation/Resource.java +++ b/java/jakarta/annotation/Resource.java @@ -27,21 +27,53 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface Resource { + +/** + * The AuthenticationType, either CONTAINER or APPLICATION + */ public enum AuthenticationType { +/** + * Container authentication + */ CONTAINER, +/** + * Application authentication + */ APPLICATION } + +/** + * @return a String with the name of the resource + */ public String name() default ""; + /** * Uses generics since Common Annotations 1.2. * * @return The type for instances of this resource */ public Class type() default Object.class; + +/** + * @return the AuthenticationType of the resource default CONTAINER + */ public AuthenticationType authenticationType() default AuthenticationType.CONTAINER; + +/** + * @return true (default) if the resource is shareable, or false if not + */ public boolean shareable() default true; + +/** + * @return a string with the description for the resource + */ public String description() default ""; + +/** + * @return a string with the mappedName of the resource + */ public String mappedName() default ""; + /** * @since Common Annotations 1.1 * diff --git a/java/jakarta/annotation/Resources.java b/java/jakarta/annotation/Resources.java index 12317ed..d595399 100644 --- a/java/jakarta/annotation/Resources.java +++ b/java/jakarta/annotation/Resources.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Resources { + +/** + * @return a Resource[] with the value of this Resources + */ public Resource[] value(); } diff --git a/java/jakarta/annotation/security/DeclareRoles.java b/java/jakarta/annotation/security/DeclareRoles.java index e0f93df..0f2eb21 100644 --- a/java/jakarta/annotation/security/DeclareRoles.java +++ b/java/jakarta/annotation/security/DeclareRoles.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DeclareRoles { + +/** + * @return a String[] with the roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RolesAllowed.java b/java/jakarta/annotation/security/RolesAllowed.java index 5c4d14f..9bb62b5 100644 --- a/java/jakarta/annotation/security/RolesAllowed.java +++ b/java/jakarta/annotation/security/RolesAllowed.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface RolesAllowed { + +/** + * @return a String[] of the allowed roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RunAs.java b/java/jakarta/annotation/security/RunAs.java index f980219..33fe276 100644 --- a/java/jakarta/annotation/security/RunAs.java +++ b/java/jakarta/annotation/security/RunAs.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface RunAs { + +
[tomcat] branch master updated (a958f03 -> 2eb0c08)
This is an automated email from the ASF dual-hosted git repository. isapir pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/tomcat.git. from a958f03 Added Javadoc comments for Java 15 new 089a803 Whitespace police new 2eb0c08 Added .vscode to gitignore The 2 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: .gitignore | 1 + java/jakarta/annotation/Resource.java | 2 +- .../annotation/sql/DataSourceDefinition.java | 38 +++--- 3 files changed, 21 insertions(+), 20 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Added Javadoc comments for Java 15
This is an automated email from the ASF dual-hosted git repository. isapir 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 a958f03 Added Javadoc comments for Java 15 a958f03 is described below commit a958f03ced5a533aec9ab9258459e3d81fd9f2b0 Author: Igal Sapir AuthorDate: Sat Oct 3 11:24:58 2020 -0700 Added Javadoc comments for Java 15 --- java/jakarta/annotation/Priority.java | 4 ++ java/jakarta/annotation/Resource.java | 32 ++ java/jakarta/annotation/Resources.java | 4 ++ java/jakarta/annotation/security/DeclareRoles.java | 4 ++ java/jakarta/annotation/security/RolesAllowed.java | 4 ++ java/jakarta/annotation/security/RunAs.java| 4 ++ .../annotation/sql/DataSourceDefinition.java | 73 ++ .../annotation/sql/DataSourceDefinitions.java | 4 ++ 8 files changed, 129 insertions(+) diff --git a/java/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java index f5b59c1..74dce8b 100644 --- a/java/jakarta/annotation/Priority.java +++ b/java/jakarta/annotation/Priority.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Priority { + +/** + * @return the int value + */ int value(); } diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java index 70b4d76..20cecab 100644 --- a/java/jakarta/annotation/Resource.java +++ b/java/jakarta/annotation/Resource.java @@ -27,21 +27,53 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface Resource { + +/** + * The AuthenticationType, either CONTAINER or APPLICATION + */ public enum AuthenticationType { +/** + * Container authentication + */ CONTAINER, +/** + * Application authentication + */ APPLICATION } + +/** + * @return a String with the name of the resource + */ public String name() default ""; + /** * Uses generics since Common Annotations 1.2. * * @return The type for instances of this resource */ public Class type() default Object.class; + +/** + * @return the AuthenticationType of the resource default CONTAINER + */ public AuthenticationType authenticationType() default AuthenticationType.CONTAINER; + +/** + * @return true (default) if the resource is shareable, or false if not + */ public boolean shareable() default true; + +/** + * @return a string with the description for the resource + */ public String description() default ""; + +/** + * @return a string with the mappedName of the resource + */ public String mappedName() default ""; + /** * @since Common Annotations 1.1 * diff --git a/java/jakarta/annotation/Resources.java b/java/jakarta/annotation/Resources.java index 12317ed..d595399 100644 --- a/java/jakarta/annotation/Resources.java +++ b/java/jakarta/annotation/Resources.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Resources { + +/** + * @return a Resource[] with the value of this Resources + */ public Resource[] value(); } diff --git a/java/jakarta/annotation/security/DeclareRoles.java b/java/jakarta/annotation/security/DeclareRoles.java index e0f93df..0f2eb21 100644 --- a/java/jakarta/annotation/security/DeclareRoles.java +++ b/java/jakarta/annotation/security/DeclareRoles.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DeclareRoles { + +/** + * @return a String[] with the roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RolesAllowed.java b/java/jakarta/annotation/security/RolesAllowed.java index 5c4d14f..9bb62b5 100644 --- a/java/jakarta/annotation/security/RolesAllowed.java +++ b/java/jakarta/annotation/security/RolesAllowed.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface RolesAllowed { + +/** + * @return a String[] of the allowed roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RunAs.java b/java/jakarta/annotation/security/RunAs.java index f980219..33fe276 100644 --- a/java/jakarta/annotation/security/RunAs.java +++ b/java/jakarta/annotation/security/RunAs.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface RunAs { + +
[tomcat] branch master updated: Added Javadoc comments for Java 15
This is an automated email from the ASF dual-hosted git repository. isapir 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 a958f03 Added Javadoc comments for Java 15 a958f03 is described below commit a958f03ced5a533aec9ab9258459e3d81fd9f2b0 Author: Igal Sapir AuthorDate: Sat Oct 3 11:24:58 2020 -0700 Added Javadoc comments for Java 15 --- java/jakarta/annotation/Priority.java | 4 ++ java/jakarta/annotation/Resource.java | 32 ++ java/jakarta/annotation/Resources.java | 4 ++ java/jakarta/annotation/security/DeclareRoles.java | 4 ++ java/jakarta/annotation/security/RolesAllowed.java | 4 ++ java/jakarta/annotation/security/RunAs.java| 4 ++ .../annotation/sql/DataSourceDefinition.java | 73 ++ .../annotation/sql/DataSourceDefinitions.java | 4 ++ 8 files changed, 129 insertions(+) diff --git a/java/jakarta/annotation/Priority.java b/java/jakarta/annotation/Priority.java index f5b59c1..74dce8b 100644 --- a/java/jakarta/annotation/Priority.java +++ b/java/jakarta/annotation/Priority.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Priority { + +/** + * @return the int value + */ int value(); } diff --git a/java/jakarta/annotation/Resource.java b/java/jakarta/annotation/Resource.java index 70b4d76..20cecab 100644 --- a/java/jakarta/annotation/Resource.java +++ b/java/jakarta/annotation/Resource.java @@ -27,21 +27,53 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD}) @Retention(RetentionPolicy.RUNTIME) public @interface Resource { + +/** + * The AuthenticationType, either CONTAINER or APPLICATION + */ public enum AuthenticationType { +/** + * Container authentication + */ CONTAINER, +/** + * Application authentication + */ APPLICATION } + +/** + * @return a String with the name of the resource + */ public String name() default ""; + /** * Uses generics since Common Annotations 1.2. * * @return The type for instances of this resource */ public Class type() default Object.class; + +/** + * @return the AuthenticationType of the resource default CONTAINER + */ public AuthenticationType authenticationType() default AuthenticationType.CONTAINER; + +/** + * @return true (default) if the resource is shareable, or false if not + */ public boolean shareable() default true; + +/** + * @return a string with the description for the resource + */ public String description() default ""; + +/** + * @return a string with the mappedName of the resource + */ public String mappedName() default ""; + /** * @since Common Annotations 1.1 * diff --git a/java/jakarta/annotation/Resources.java b/java/jakarta/annotation/Resources.java index 12317ed..d595399 100644 --- a/java/jakarta/annotation/Resources.java +++ b/java/jakarta/annotation/Resources.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface Resources { + +/** + * @return a Resource[] with the value of this Resources + */ public Resource[] value(); } diff --git a/java/jakarta/annotation/security/DeclareRoles.java b/java/jakarta/annotation/security/DeclareRoles.java index e0f93df..0f2eb21 100644 --- a/java/jakarta/annotation/security/DeclareRoles.java +++ b/java/jakarta/annotation/security/DeclareRoles.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface DeclareRoles { + +/** + * @return a String[] with the roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RolesAllowed.java b/java/jakarta/annotation/security/RolesAllowed.java index 5c4d14f..9bb62b5 100644 --- a/java/jakarta/annotation/security/RolesAllowed.java +++ b/java/jakarta/annotation/security/RolesAllowed.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target({ElementType.TYPE, ElementType.METHOD}) @Retention(RetentionPolicy.RUNTIME) public @interface RolesAllowed { + +/** + * @return a String[] of the allowed roles + */ public String[] value(); } diff --git a/java/jakarta/annotation/security/RunAs.java b/java/jakarta/annotation/security/RunAs.java index f980219..33fe276 100644 --- a/java/jakarta/annotation/security/RunAs.java +++ b/java/jakarta/annotation/security/RunAs.java @@ -29,5 +29,9 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) public @interface RunAs { + +
[GitHub] [tomcat-jakartaee-migration] ChristopherSchultz closed issue #4: Download of Release
ChristopherSchultz closed issue #4: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/4 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. 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
[GitHub] [tomcat-jakartaee-migration] ChristopherSchultz commented on issue #4: Download of Release
ChristopherSchultz commented on issue #4: URL: https://github.com/apache/tomcat-jakartaee-migration/issues/4#issuecomment-703100871 This is intended to be a tool used by developers. Anyone qualified to use this tool should also be qualified to build it from source. Don't expect a binary release anytime soon. 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. 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