[tomcat] branch master updated: Re-format, no functional change in preparation for functional changes
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
The following commit(s) were added to refs/heads/master by this push:
new 0dacb91 Re-format, no functional change in preparation for functional
changes
0dacb91 is described below
commit 0dacb9126de98843970dfff0e828eb42eefaeb69
Author: Mark Thomas
AuthorDate: Fri Jan 22 19:14:15 2021 +
Re-format, no functional change in preparation for functional changes
---
java/org/apache/catalina/mbeans/MBeanFactory.java | 2 -
java/org/apache/catalina/startup/HostConfig.java | 241 +-
2 files changed, 93 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java
b/java/org/apache/catalina/mbeans/MBeanFactory.java
index 8ef53ce..2858615 100644
--- a/java/org/apache/catalina/mbeans/MBeanFactory.java
+++ b/java/org/apache/catalina/mbeans/MBeanFactory.java
@@ -440,7 +440,6 @@ public class MBeanFactory {
// Return the corresponding MBean name
return context.getObjectName().toString();
-
}
@@ -736,7 +735,6 @@ public class MBeanFactory {
}
}
-
}
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index fd81ad2..89d002a 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -417,7 +417,6 @@ public class HostConfig implements LifecycleListener {
* in our "application root" directory.
*/
protected void deployApps() {
-
File appBase = host.getAppBaseFile();
File configBase = host.getConfigBaseFile();
String[] filteredAppPaths = filterAppPaths(appBase.list());
@@ -427,7 +426,6 @@ public class HostConfig implements LifecycleListener {
deployWARs(appBase, filteredAppPaths);
// Deploy expanded folders
deployDirectories(appBase, filteredAppPaths);
-
}
@@ -495,8 +493,9 @@ public class HostConfig implements LifecycleListener {
}
// Deploy expanded folder
File dir = new File(appBase, baseName);
-if (dir.exists())
+if (dir.exists()) {
deployDirectory(cn, dir);
+}
}
@@ -507,8 +506,9 @@ public class HostConfig implements LifecycleListener {
*/
protected void deployDescriptors(File configBase, String[] files) {
-if (files == null)
+if (files == null) {
return;
+}
ExecutorService es = host.getStartStopExecutor();
List> results = new ArrayList<>();
@@ -519,11 +519,11 @@ public class HostConfig implements LifecycleListener {
if (file.toLowerCase(Locale.ENGLISH).endsWith(".xml")) {
ContextName cn = new ContextName(file, true);
-if (isServiced(cn.getName()) || deploymentExists(cn.getName()))
+if (isServiced(cn.getName()) ||
deploymentExists(cn.getName())) {
continue;
+}
-results.add(
-es.submit(new DeployDescriptor(this, cn, contextXml)));
+results.add(es.submit(new DeployDescriptor(this, cn,
contextXml)));
}
}
@@ -531,8 +531,7 @@ public class HostConfig implements LifecycleListener {
try {
result.get();
} catch (Exception e) {
-log.error(sm.getString(
-"hostConfig.deployDescriptor.threaded.error"), e);
+
log.error(sm.getString("hostConfig.deployDescriptor.threaded.error"), e);
}
}
}
@@ -546,15 +545,13 @@ public class HostConfig implements LifecycleListener {
@SuppressWarnings("null") // context is not null
protected void deployDescriptor(ContextName cn, File contextXml) {
-DeployedApplication deployedApp =
-new DeployedApplication(cn.getName(), true);
+DeployedApplication deployedApp = new
DeployedApplication(cn.getName(), true);
long startTime = 0;
// Assume this is a configuration descriptor and deploy it
-if(log.isInfoEnabled()) {
+if (log.isInfoEnabled()) {
startTime = System.currentTimeMillis();
- log.info(sm.getString("hostConfig.deployDescriptor",
-contextXml.getAbsolutePath()));
+ log.info(sm.getString("hostConfig.deployDescriptor",
contextXml.getAbsolutePath()));
}
Context context = null;
@@ -567,9 +564,7 @@ public class HostConfig implements LifecycleListener {
try {
context = (Context) digester.parse(fis);
} catch (Exception e) {
-log.error(sm.getString(
-"hostConfig.deployDescriptor.error",
-contextXm
[tomcat] branch master updated: Ensure Windows signing uses sha256 hash
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 The following commit(s) were added to refs/heads/master by this push: new 7bb9eec Ensure Windows signing uses sha256 hash 7bb9eec is described below commit 7bb9eeced9522058796c3dfdc759e3f5eedb258d Author: Mark Thomas AuthorDate: Sun Jan 24 09:42:06 2021 + Ensure Windows signing uses sha256 hash --- build.xml | 4 1 file changed, 4 insertions(+) diff --git a/build.xml b/build.xml index 32142c8..be0f1da 100644 --- a/build.xml +++ b/build.xml @@ -2575,6 +2575,8 @@ skip.installer property in build.properties" /> + + http://timestamp.digicert.com"/> @@ -2605,6 +2607,8 @@ skip.installer property in build.properties" /> + + 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 9.0.x updated (e12eb8e -> c691827)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from e12eb8e Comment out / make configurable the performance aspects of these tests new 8b0416a Re-format, no functional change in preparation for functional changes new c691827 Ensure Windows signing uses sha256 hash 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: build.xml | 4 + java/org/apache/catalina/mbeans/MBeanFactory.java | 2 - java/org/apache/catalina/startup/HostConfig.java | 241 +- 3 files changed, 97 insertions(+), 150 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Re-format, no functional change in preparation for functional changes
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
commit 8b0416a6fd46d62b1ad71e994736a531d67c9baa
Author: Mark Thomas
AuthorDate: Fri Jan 22 19:14:15 2021 +
Re-format, no functional change in preparation for functional changes
---
java/org/apache/catalina/mbeans/MBeanFactory.java | 2 -
java/org/apache/catalina/startup/HostConfig.java | 241 +-
2 files changed, 93 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java
b/java/org/apache/catalina/mbeans/MBeanFactory.java
index bf2970e..4f81571 100644
--- a/java/org/apache/catalina/mbeans/MBeanFactory.java
+++ b/java/org/apache/catalina/mbeans/MBeanFactory.java
@@ -472,7 +472,6 @@ public class MBeanFactory {
// Return the corresponding MBean name
return context.getObjectName().toString();
-
}
@@ -768,7 +767,6 @@ public class MBeanFactory {
}
}
-
}
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index fd81ad2..89d002a 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -417,7 +417,6 @@ public class HostConfig implements LifecycleListener {
* in our "application root" directory.
*/
protected void deployApps() {
-
File appBase = host.getAppBaseFile();
File configBase = host.getConfigBaseFile();
String[] filteredAppPaths = filterAppPaths(appBase.list());
@@ -427,7 +426,6 @@ public class HostConfig implements LifecycleListener {
deployWARs(appBase, filteredAppPaths);
// Deploy expanded folders
deployDirectories(appBase, filteredAppPaths);
-
}
@@ -495,8 +493,9 @@ public class HostConfig implements LifecycleListener {
}
// Deploy expanded folder
File dir = new File(appBase, baseName);
-if (dir.exists())
+if (dir.exists()) {
deployDirectory(cn, dir);
+}
}
@@ -507,8 +506,9 @@ public class HostConfig implements LifecycleListener {
*/
protected void deployDescriptors(File configBase, String[] files) {
-if (files == null)
+if (files == null) {
return;
+}
ExecutorService es = host.getStartStopExecutor();
List> results = new ArrayList<>();
@@ -519,11 +519,11 @@ public class HostConfig implements LifecycleListener {
if (file.toLowerCase(Locale.ENGLISH).endsWith(".xml")) {
ContextName cn = new ContextName(file, true);
-if (isServiced(cn.getName()) || deploymentExists(cn.getName()))
+if (isServiced(cn.getName()) ||
deploymentExists(cn.getName())) {
continue;
+}
-results.add(
-es.submit(new DeployDescriptor(this, cn, contextXml)));
+results.add(es.submit(new DeployDescriptor(this, cn,
contextXml)));
}
}
@@ -531,8 +531,7 @@ public class HostConfig implements LifecycleListener {
try {
result.get();
} catch (Exception e) {
-log.error(sm.getString(
-"hostConfig.deployDescriptor.threaded.error"), e);
+
log.error(sm.getString("hostConfig.deployDescriptor.threaded.error"), e);
}
}
}
@@ -546,15 +545,13 @@ public class HostConfig implements LifecycleListener {
@SuppressWarnings("null") // context is not null
protected void deployDescriptor(ContextName cn, File contextXml) {
-DeployedApplication deployedApp =
-new DeployedApplication(cn.getName(), true);
+DeployedApplication deployedApp = new
DeployedApplication(cn.getName(), true);
long startTime = 0;
// Assume this is a configuration descriptor and deploy it
-if(log.isInfoEnabled()) {
+if (log.isInfoEnabled()) {
startTime = System.currentTimeMillis();
- log.info(sm.getString("hostConfig.deployDescriptor",
-contextXml.getAbsolutePath()));
+ log.info(sm.getString("hostConfig.deployDescriptor",
contextXml.getAbsolutePath()));
}
Context context = null;
@@ -567,9 +564,7 @@ public class HostConfig implements LifecycleListener {
try {
context = (Context) digester.parse(fis);
} catch (Exception e) {
-log.error(sm.getString(
-"hostConfig.deployDescriptor.error",
-contextXml.getAbsolutePath()), e);
+
log.error(sm.getString("hostConfig.deployDescriptor.error",
contextXml.getAbsolutePath()), e);
} finally {
[tomcat] 02/02: Ensure Windows signing uses sha256 hash
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 commit c691827c31e1e5155e2607750df9d8296d010426 Author: Mark Thomas AuthorDate: Sun Jan 24 09:42:06 2021 + Ensure Windows signing uses sha256 hash --- build.xml | 4 1 file changed, 4 insertions(+) diff --git a/build.xml b/build.xml index 19ff206..74df762 100644 --- a/build.xml +++ b/build.xml @@ -2566,6 +2566,8 @@ skip.installer property in build.properties" /> + + http://timestamp.digicert.com"/> @@ -2596,6 +2598,8 @@ skip.installer property in build.properties" /> + + 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 (d7a7c40 -> f12339c)
This is an automated email from the ASF dual-hosted git repository. markt pushed a change to branch 8.5.x in repository https://gitbox.apache.org/repos/asf/tomcat.git. from d7a7c40 Comment out / make configurable the performance aspects of these tests new f084e20 Re-format, no functional change in preparation for functional changes new f12339c Ensure Windows signing uses sha256 hash 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: build.xml | 4 + java/org/apache/catalina/mbeans/MBeanFactory.java | 2 - java/org/apache/catalina/startup/HostConfig.java | 241 +- 3 files changed, 97 insertions(+), 150 deletions(-) - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] 01/02: Re-format, no functional change in preparation for functional changes
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
commit f084e20f56bbe6c918e12c1f6c7616c47af1b394
Author: Mark Thomas
AuthorDate: Fri Jan 22 19:14:15 2021 +
Re-format, no functional change in preparation for functional changes
---
java/org/apache/catalina/mbeans/MBeanFactory.java | 2 -
java/org/apache/catalina/startup/HostConfig.java | 241 +-
2 files changed, 93 insertions(+), 150 deletions(-)
diff --git a/java/org/apache/catalina/mbeans/MBeanFactory.java
b/java/org/apache/catalina/mbeans/MBeanFactory.java
index ee45cd0..70fee81 100644
--- a/java/org/apache/catalina/mbeans/MBeanFactory.java
+++ b/java/org/apache/catalina/mbeans/MBeanFactory.java
@@ -495,7 +495,6 @@ public class MBeanFactory {
// Return the corresponding MBean name
return context.getObjectName().toString();
-
}
@@ -805,7 +804,6 @@ public class MBeanFactory {
}
}
-
}
diff --git a/java/org/apache/catalina/startup/HostConfig.java
b/java/org/apache/catalina/startup/HostConfig.java
index 6ee7847..ba41cd8 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -416,7 +416,6 @@ public class HostConfig implements LifecycleListener {
* in our "application root" directory.
*/
protected void deployApps() {
-
File appBase = host.getAppBaseFile();
File configBase = host.getConfigBaseFile();
String[] filteredAppPaths = filterAppPaths(appBase.list());
@@ -426,7 +425,6 @@ public class HostConfig implements LifecycleListener {
deployWARs(appBase, filteredAppPaths);
// Deploy expanded folders
deployDirectories(appBase, filteredAppPaths);
-
}
@@ -494,8 +492,9 @@ public class HostConfig implements LifecycleListener {
}
// Deploy expanded folder
File dir = new File(appBase, baseName);
-if (dir.exists())
+if (dir.exists()) {
deployDirectory(cn, dir);
+}
}
@@ -506,8 +505,9 @@ public class HostConfig implements LifecycleListener {
*/
protected void deployDescriptors(File configBase, String[] files) {
-if (files == null)
+if (files == null) {
return;
+}
ExecutorService es = host.getStartStopExecutor();
List> results = new ArrayList<>();
@@ -518,11 +518,11 @@ public class HostConfig implements LifecycleListener {
if (file.toLowerCase(Locale.ENGLISH).endsWith(".xml")) {
ContextName cn = new ContextName(file, true);
-if (isServiced(cn.getName()) || deploymentExists(cn.getName()))
+if (isServiced(cn.getName()) ||
deploymentExists(cn.getName())) {
continue;
+}
-results.add(
-es.submit(new DeployDescriptor(this, cn, contextXml)));
+results.add(es.submit(new DeployDescriptor(this, cn,
contextXml)));
}
}
@@ -530,8 +530,7 @@ public class HostConfig implements LifecycleListener {
try {
result.get();
} catch (Exception e) {
-log.error(sm.getString(
-"hostConfig.deployDescriptor.threaded.error"), e);
+
log.error(sm.getString("hostConfig.deployDescriptor.threaded.error"), e);
}
}
}
@@ -545,15 +544,13 @@ public class HostConfig implements LifecycleListener {
@SuppressWarnings("null") // context is not null
protected void deployDescriptor(ContextName cn, File contextXml) {
-DeployedApplication deployedApp =
-new DeployedApplication(cn.getName(), true);
+DeployedApplication deployedApp = new
DeployedApplication(cn.getName(), true);
long startTime = 0;
// Assume this is a configuration descriptor and deploy it
-if(log.isInfoEnabled()) {
+if (log.isInfoEnabled()) {
startTime = System.currentTimeMillis();
- log.info(sm.getString("hostConfig.deployDescriptor",
-contextXml.getAbsolutePath()));
+ log.info(sm.getString("hostConfig.deployDescriptor",
contextXml.getAbsolutePath()));
}
Context context = null;
@@ -566,9 +563,7 @@ public class HostConfig implements LifecycleListener {
try {
context = (Context) digester.parse(fis);
} catch (Exception e) {
-log.error(sm.getString(
-"hostConfig.deployDescriptor.error",
-contextXml.getAbsolutePath()), e);
+
log.error(sm.getString("hostConfig.deployDescriptor.error",
contextXml.getAbsolutePath()), e);
} finally {
[tomcat] 02/02: Ensure Windows signing uses sha256 hash
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 commit f12339c449319bcfb9cd748a53227d6b8a0bf860 Author: Mark Thomas AuthorDate: Sun Jan 24 09:42:06 2021 + Ensure Windows signing uses sha256 hash --- build.xml | 4 1 file changed, 4 insertions(+) diff --git a/build.xml b/build.xml index a604caf..4c8bd89 100644 --- a/build.xml +++ b/build.xml @@ -2250,6 +2250,8 @@ skip.installer property in build.properties" /> + + http://timestamp.digicert.com"/> @@ -2280,6 +2282,8 @@ skip.installer property in build.properties" /> + + 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 7.0.x updated: Ensure Windows signing uses sha256 hash
This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 7.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git The following commit(s) were added to refs/heads/7.0.x by this push: new 6fcf65d Ensure Windows signing uses sha256 hash 6fcf65d is described below commit 6fcf65d7cc84a11effdda0c50dab3d88256f8aab Author: Mark Thomas AuthorDate: Sun Jan 24 09:42:06 2021 + Ensure Windows signing uses sha256 hash --- build.xml | 4 1 file changed, 4 insertions(+) diff --git a/build.xml b/build.xml index 54b4acc..c597118 100644 --- a/build.xml +++ b/build.xml @@ -2394,6 +2394,8 @@ skip.installer property in build.properties" /> + + http://timestamp.digicert.com"/> @@ -2424,6 +2426,8 @@ skip.installer property in build.properties" /> + + http://timestamp.digicert.com"/> - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-7-trunk
The Buildbot has detected a restored build on builder tomcat-7-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-7-trunk/builds/1842 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: asf946_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-7-commit' triggered this build Build Source Stamp: [branch 7.0.x] 6fcf65d7cc84a11effdda0c50dab3d88256f8aab Blamelist: Mark Thomas Build succeeded! Sincerely, -The Buildbot - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
