[tomcat] branch 8.5.x updated: Fix indent and small bits of other formatting. No functional change.
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 7200a0cb3a Fix indent and small bits of other formatting. No
functional change.
7200a0cb3a is described below
commit 7200a0cb3a15d0783a2ee4aa58e3514aa23dcace
Author: Mark Thomas
AuthorDate: Fri Jun 17 19:13:53 2022 +0100
Fix indent and small bits of other formatting. No functional change.
Fixes the jakarta.* packages
---
java/javax/ejb/EJBs.java | 2 +-
java/javax/persistence/PersistenceContexts.java| 2 +-
java/javax/persistence/PersistenceUnits.java | 2 +-
java/javax/servlet/AsyncContext.java | 3 +-
java/javax/servlet/jsp/HttpJspPage.java| 2 +-
java/javax/servlet/jsp/el/ELParseException.java| 36 --
java/javax/servlet/jsp/el/FunctionMapper.java | 19 +-
.../servlet/jsp/el/ImplicitObjectELResolver.java | 44 +++---
java/javax/servlet/jsp/tagext/PageData.java| 2 +-
java/javax/servlet/jsp/tagext/TagInfo.java | 31 ++-
10 files changed, 65 insertions(+), 78 deletions(-)
diff --git a/java/javax/ejb/EJBs.java b/java/javax/ejb/EJBs.java
index ac112b3220..f6f0e3 100644
--- a/java/javax/ejb/EJBs.java
+++ b/java/javax/ejb/EJBs.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface EJBs {
- EJB[] value();
+EJB[] value();
}
diff --git a/java/javax/persistence/PersistenceContexts.java
b/java/javax/persistence/PersistenceContexts.java
index 8aa9fde81a..6c6de369e6 100644
--- a/java/javax/persistence/PersistenceContexts.java
+++ b/java/javax/persistence/PersistenceContexts.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceContexts {
- PersistenceContext[] value();
+PersistenceContext[] value();
}
diff --git a/java/javax/persistence/PersistenceUnits.java
b/java/javax/persistence/PersistenceUnits.java
index 0d12ded4e3..ebfd3c9f64 100644
--- a/java/javax/persistence/PersistenceUnits.java
+++ b/java/javax/persistence/PersistenceUnits.java
@@ -25,5 +25,5 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
public @interface PersistenceUnits {
- PersistenceUnit[] value();
+PersistenceUnit[] value();
}
diff --git a/java/javax/servlet/AsyncContext.java
b/java/javax/servlet/AsyncContext.java
index 30052f9e66..57335bf8ea 100644
--- a/java/javax/servlet/AsyncContext.java
+++ b/java/javax/servlet/AsyncContext.java
@@ -142,8 +142,7 @@ public interface AsyncContext {
* @return the newly created AsyncListener object
* @throws ServletException if the listener cannot be created
*/
- T createListener(Class clazz)
-throws ServletException;
+ T createListener(Class clazz) throws
ServletException;
/**
* Set the timeout.
diff --git a/java/javax/servlet/jsp/HttpJspPage.java
b/java/javax/servlet/jsp/HttpJspPage.java
index 5bbdc12a79..915463e381 100644
--- a/java/javax/servlet/jsp/HttpJspPage.java
+++ b/java/javax/servlet/jsp/HttpJspPage.java
@@ -55,5 +55,5 @@ public interface HttpJspPage extends JspPage {
*/
public void _jspService(HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException;
+throws ServletException, IOException;
}
diff --git a/java/javax/servlet/jsp/el/ELParseException.java
b/java/javax/servlet/jsp/el/ELParseException.java
index a40e4e8d75..4d6335e16e 100644
--- a/java/javax/servlet/jsp/el/ELParseException.java
+++ b/java/javax/servlet/jsp/el/ELParseException.java
@@ -26,27 +26,23 @@ package javax.servlet.jsp.el;
@SuppressWarnings("dep-ann") // TCK signature test fails with annotation
public class ELParseException extends ELException {
- private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 1L;
-//-
- /**
- * Creates an ELParseException with no detail message.
- */
- public ELParseException ()
- {
-super ();
- }
- //-
- /**
- * Creates an ELParseException with the provided detail message.
- *
- * @param pMessage the detail message
- **/
- public ELParseException (String pMessage)
- {
-super (pMessage);
- }
+/**
+ * Creates an ELParseException with no detail message.
+ */
+public ELParseException () {
+super ();
+}
- //-
+
+/**
+ * Creates an ELParseException with the provided detail message.
+ *
+ * @param pMessage the detail message
+ */
+public ELParseException (String pMessage) {
+super (pMessage);
+}
}
diff --git
[tomcat] branch 8.5.x updated: Fix indent
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 cc4281543a Fix indent
cc4281543a is described below
commit cc4281543af340a38fa8d1c2e76d033ac629bbca
Author: Mark Thomas
AuthorDate: Tue May 24 18:58:21 2022 +0100
Fix indent
---
java/org/apache/tomcat/jni/SSL.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/java/org/apache/tomcat/jni/SSL.java
b/java/org/apache/tomcat/jni/SSL.java
index 06b6090111..316e6182e3 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -343,7 +343,7 @@ public final class SSL {
* @return New BIO handle
* @throws Exception An error occurred
*/
- public static native long newBIO(long pool, BIOCallback callback)
+public static native long newBIO(long pool, BIOCallback callback)
throws Exception;
/**
@@ -351,19 +351,19 @@ public final class SSL {
* @param bio BIO to close and destroy.
* @return APR Status code
*/
- public static native int closeBIO(long bio);
+public static native int closeBIO(long bio);
/**
* Set global Password callback for obtaining passwords.
* @param callback PasswordCallback implementation to use.
*/
- public static native void setPasswordCallback(PasswordCallback callback);
+public static native void setPasswordCallback(PasswordCallback callback);
/**
* Set global Password for decrypting certificates and keys.
* @param password Password to use.
*/
- public static native void setPassword(String password);
+public static native void setPassword(String password);
/**
* Return last SSL error string
-
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: Fix indent
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 6ce68ce Fix indent
6ce68ce is described below
commit 6ce68ceea5cc3de07c28df4b1b46ee155787db8d
Author: Mark Thomas
AuthorDate: Mon Feb 21 16:25:18 2022 +
Fix indent
---
build.xml | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/build.xml b/build.xml
index a640e20..8427711 100644
--- a/build.xml
+++ b/build.xml
@@ -2214,11 +2214,11 @@ skip.installer property in build.properties" />
description="Builds and optionally signs the Windows installer"
depends="-installer,setup-jsign" if="${do.codesigning}" >
http://timestamp.digicert.com"/>
+storepass="${codesigning.storepass}"
+storetype="${codesigning.storetype}"
+alias="${codesigning.alias}"
+alg="${codesigning.digest}"
+tsaurl="http://timestamp.digicert.com"/>
-
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: Fix indent
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 b30f045 Fix indent
b30f045 is described below
commit b30f045fa60c71bb9a0da3575ca4af6d3fc1ec56
Author: Mark Thomas
AuthorDate: Fri Mar 19 09:36:33 2021 +
Fix indent
---
build.xml | 62 +++---
1 file changed, 31 insertions(+), 31 deletions(-)
diff --git a/build.xml b/build.xml
index 212895b..2b63398 100644
--- a/build.xml
+++ b/build.xml
@@ -2112,37 +2112,37 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
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: Fix indent
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 ca38cf1 Fix indent
ca38cf1 is described below
commit ca38cf161bd5810ce956b301b56d0ff31ee45ea0
Author: Mark Thomas
AuthorDate: Wed Sep 18 10:07:03 2019 +0100
Fix indent
---
build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 1f4761f..569afa5 100644
--- a/build.xml
+++ b/build.xml
@@ -1980,7 +1980,7 @@ Apache Tomcat ${version} native binaries for Win64
AMD64/EMT64 platform.
-
+
https://docs.oracle.com/javase/7/docs/api/"/>
https://docs.oracle.com/javaee/7/api/"/>
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
