[tomcat] branch master updated: Ensure that members registered in the addSuspects list are static members.
This is an automated email from the ASF dual-hosted git repository.
kfujino 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 b13281e Ensure that members registered in the addSuspects list are
static members.
b13281e is described below
commit b13281e7f63e15590adfbf4fbd19493c55cd10a4
Author: kfujino
AuthorDate: Tue Mar 5 16:39:24 2019 +0900
Ensure that members registered in the addSuspects list are static
members.
---
.../apache/catalina/tribes/group/interceptors/TcpFailureDetector.java | 4 +++-
webapps/docs/changelog.xml| 4
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git
a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
index 2253d4a..281ee4d 100644
--- a/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
+++ b/java/org/apache/catalina/tribes/group/interceptors/TcpFailureDetector.java
@@ -134,7 +134,9 @@ public class TcpFailureDetector extends
ChannelInterceptorBase implements TcpFai
addSuspects.remove(member);
notify = true;
} else {
-addSuspects.put(member,
Long.valueOf(System.currentTimeMillis()));
+if (member instanceof StaticMember) {
+addSuspects.put(member,
Long.valueOf(System.currentTimeMillis()));
+}
}
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 279096a..431b57c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -141,6 +141,10 @@
Add feature that discover local member from the static member list.
(kfujino)
+
+Ensure that members registered in the addSuspects list are static
+members. (kfujino)
+
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63210] Tomcat failing to shutdown if EvictionTimer thread is running
https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
--- Comment #12 from k...@gameldar.com ---
(In reply to Mark Thomas from comment #10)
> DBCP2 (actually Pool2) requires explicit shutdown and is documented as such.
> If it is shutdown (via closeMethod="close") then the Evictor thread is
> stopped.
>
> My current thinking is to set closeMethod="close" if we create a DataSource
> resource using the built-in factory and to do so in such as way that the
> user can override it if they wish. I need to test this works as expected.
I've just built and tested from the git repository source - the implementation
works as you have implemented - it shuts down correctly without the value set,
and fails to shutdown if closeMethod="" is used.
It actually doesn't fix my use case but that is because we implement our own
factory that returns the BasicDataSource. However it does point me to the
correct solution, which is to set the closeMethod="close" in my case (I thought
I had tried this) - which already works with 9.0.16.
I guess the only change that could make this more generic is to test the
actualResource for implementing AutoClosable e.g. something like:
Object actualResource = envCtx.lookup(resource.getName());
+ if (!resource.isCloseMethodConfigured() && actualResource instanceof
AutoCloseable) {
+ resource.setCloseMethod("close");
+ }
--
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854807 - in /tomcat/maven-plugin/trunk: tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/ tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/
Author: ebourg
Date: Tue Mar 5 01:03:29 2019
New Revision: 1854807
URL: http://svn.apache.org/viewvc?rev=1854807=rev
Log:
Java 7 syntax
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
tomcat/maven-plugin/trunk/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
tomcat/maven-plugin/trunk/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/Tomcat8Runner.java
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java?rev=1854807=1854806=1854807=diff
==
---
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractExecWarMojo.java
Tue Mar 5 01:03:29 2019
@@ -590,17 +590,17 @@ public abstract class AbstractExecWarMoj
}
-protected String[] toStringArray( List list )
+protected String[] toStringArray( List list )
{
if ( list == null || list.isEmpty() )
{
return new String[0];
}
-List res = new ArrayList( list.size() );
+List res = new ArrayList<>( list.size() );
-for ( Iterator ite = list.iterator(); ite.hasNext(); )
+for ( String s : list )
{
-res.add( (String) ite.next() );
+res.add( s );
}
return res.toArray( new String[res.size()] );
}
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java?rev=1854807=1854806=1854807=diff
==
---
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunMojo.java
Tue Mar 5 01:03:29 2019
@@ -325,7 +325,7 @@ public class RunMojo
final List jarPaths = extractJars( classLoaderEntries );
-List urls = new ArrayList( jarPaths.size() );
+List urls = new ArrayList<>( jarPaths.size() );
for ( String jarPath : jarPaths )
{
@@ -411,8 +411,8 @@ public class RunMojo
{
Enumeration enumeration =
urlClassLoader.findResources(
StringUtils.removeStart( path, "/" ) );
-List urlsFound = new ArrayList();
-List webResources = new
ArrayList();
+List urlsFound = new ArrayList<>();
+List webResources = new ArrayList<>();
while ( enumeration.hasMoreElements() )
{
URL url = enumeration.nextElement();
@@ -439,7 +439,7 @@ public class RunMojo
{
try
{
-List webResources = new
ArrayList();
+List webResources = new ArrayList<>();
for ( String directory : directories )
{
@@ -610,14 +610,14 @@ public class RunMojo
if ( StringUtils.equalsIgnoreCase( "/WEB-INF/lib/",
path ) )
{
// adding outputDirectory as well?
-return new HashSet( jarPaths );
+return new HashSet<>( jarPaths );
}
File filePath = new File( getWarSourceDirectory(),
path );
if ( filePath.isDirectory() )
{
-Set paths = new HashSet();
+Set paths = new HashSet<>();
String[] files = filePath.list();
if ( files == null )
@@ -682,7 +682,7 @@ public class RunMojo
throws MojoExecutionException
{
-List jarPaths = new ArrayList();
+List jarPaths = new ArrayList<>();
try
{
Modified:
svn commit: r1854806 - /tomcat/maven-plugin/trunk/pom.xml
Author: ebourg Date: Tue Mar 5 00:53:30 2019 New Revision: 1854806 URL: http://svn.apache.org/viewvc?rev=1854806=rev Log: Bumped the language level to Java 7 Modified: tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1854806=1854805=1854806=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Tue Mar 5 00:53:30 2019 @@ -41,8 +41,8 @@ UTF-8 -1.5 -1.5 +1.7 +1.7 2.2.1 3.6.0 @@ -830,7 +830,7 @@ - 1.6.0 + 1.7.0 - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854805 - in /tomcat/maven-plugin/trunk: pom.xml src/site/site.xml
Author: ebourg
Date: Tue Mar 5 00:48:37 2019
New Revision: 1854805
URL: http://svn.apache.org/viewvc?rev=1854805=rev
Log:
Updated the Maven plugins
Modified:
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/src/site/site.xml
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1854805=1854804=1854805=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Tue Mar 5 00:48:37 2019
@@ -45,10 +45,10 @@
1.5
2.2.1
-3.2
+3.6.0
false
-2.18.1
+2.22.1
${surefire.version}
4.10
@@ -674,11 +674,11 @@
org.apache.maven.plugins
maven-antrun-plugin
- 1.6
+ 1.8
maven-compiler-plugin
- 2.5.1
+ 3.8.0
${project.build.sourceEncoding}
${maven.compiler.source}
@@ -688,7 +688,7 @@
org.apache.maven.plugins
maven-dependency-plugin
- 2.5.1
+ 3.1.1
org.apache.maven.plugins
@@ -703,7 +703,7 @@
org.apache.maven.plugins
maven-install-plugin
- 2.3.1
+ 2.5.2
true
@@ -734,12 +734,12 @@
org.apache.maven.plugins
maven-deploy-plugin
- 2.5
+ 2.8.2
org.apache.maven.plugins
maven-release-plugin
- 2.5
+ 2.5.3
clean install
@@ -747,27 +747,27 @@
org.apache.maven.plugins
maven-resources-plugin
- 2.6
+ 3.1.0
org.apache.maven.plugins
maven-site-plugin
- 3.3
+ 3.7.1
org.apache.maven.plugins
maven-invoker-plugin
- 1.8
+ 3.2.0
org.codehaus.plexus
plexus-component-metadata
- 1.5.5
+ 2.0.0
org.apache.rat
apache-rat-plugin
- 0.11
+ 0.13
.gitignore
@@ -787,7 +787,7 @@
org.apache.maven.plugins
maven-scm-publish-plugin
- 1.0
+ 3.0.0
scm:svn:https://svn.apache.org/repos/asf/tomcat/site/trunk/docs/${sitePath}
Apache Tomcat Maven Plugin site documentation for
${project.version}
@@ -799,7 +799,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
- 2.9.1
+ 3.1.0
@@ -820,7 +820,7 @@
org.apache.maven.plugins
maven-enforcer-plugin
-1.3.1
+1.4.1
enforce-java
@@ -863,7 +863,7 @@
org.apache.maven.plugins
maven-project-info-reports-plugin
-2.7
+2.9
true
@@ -881,7 +881,7 @@
org.apache.maven.plugins
maven-javadoc-plugin
-2.9.1
+3.1.0
false
@@ -914,7 +914,7 @@
org.apache.maven.plugins
maven-changes-plugin
-2.8
+2.12.1
false
Type,Fix
Version,Key,Summary,Assignee,Status,Created
@@ -949,7 +949,7 @@
maven-pmd-plugin
-2.5
+3.11.0
${maven.compiler.target}
@@ -960,7 +960,7 @@
org.apache.maven.plugins
maven-checkstyle-plugin
-2.9.1
+3.0.0
config/maven_checks.xml
config/maven-header.txt
@@ -969,7 +969,7 @@
org.apache.maven.plugins
maven-jxr-plugin
-2.2
+3.0.0
org.codehaus.sonar-plugins
Modified: tomcat/maven-plugin/trunk/src/site/site.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/site.xml?rev=1854805=1854804=1854805=diff
==
--- tomcat/maven-plugin/trunk/src/site/site.xml (original)
+++ tomcat/maven-plugin/trunk/src/site/site.xml Tue Mar 5 00:48:37 2019
@@ -30,7 +30,7 @@
org.apache.maven.skins
maven-fluido-skin
-1.3.1
+1.7
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854804 - in /tomcat/maven-plugin/trunk: tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/ tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomca
Author: ebourg
Date: Tue Mar 5 00:46:27 2019
New Revision: 1854804
URL: http://svn.apache.org/viewvc?rev=1854804=rev
Log:
Replaced the @Component annotations on the MavenProject, MavenSession and
Settings fields with the equivalent @Parameter syntax
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java?rev=1854804=1854803=1854804=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
Tue Mar 5 00:46:27 2019
@@ -75,7 +75,7 @@ public abstract class AbstractCatalinaMo
/**
* The current build session instance. This is used for plugin manager API
calls.
*/
-@Component
+@Parameter( defaultValue = "${session}", readonly = true )
private MavenSession session;
/**
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java?rev=1854804=1854803=1854804=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractTomcat7Mojo.java
Tue Mar 5 00:46:27 2019
@@ -33,7 +33,7 @@ import org.apache.tomcat.maven.common.me
public abstract class AbstractTomcat7Mojo
extends AbstractMojo
{
-@Component
+@Parameter( defaultValue = "${settings}", readonly = true )
protected Settings settings;
@Component
Modified:
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java?rev=1854804=1854803=1854804=diff
==
---
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
Tue Mar 5 00:46:27 2019
@@ -275,7 +275,7 @@ public abstract class AbstractRunMojo
*
* @since 1.0
*/
-@Component
+@Parameter( defaultValue = "${project}", readonly = true )
protected MavenProject project;
/**
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java?rev=1854804=1854803=1854804=diff
==
---
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
(original)
+++
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractTomcat8Mojo.java
Tue Mar 5 00:46:27 2019
@@ -33,7 +33,7 @@ import org.apache.tomcat.maven.common.me
public abstract class AbstractTomcat8Mojo
extends AbstractMojo
{
-@Component
+@Parameter( defaultValue = "${settings}", readonly = true )
protected Settings settings;
@Component
Modified:
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
URL:
svn commit: r1854802 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/ common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven
Author: ebourg
Date: Tue Mar 5 00:28:07 2019
New Revision: 1854802
URL: http://svn.apache.org/viewvc?rev=1854802=rev
Log:
Fixed the javadoc errors (and some warnings)
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerException.java
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/messages/DefaultMessagesProvider.java
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/run/ClassLoaderEntriesCalculatorResult.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/AbstractWarCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/deploy/DeployMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/RunWarMojo.java
tomcat/maven-plugin/trunk/tomcat7-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/AbstractWarCatalinaMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/deploy/AbstractDeployMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/deploy/DeployMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunWarMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/RunWarMojo.java
tomcat/maven-plugin/trunk/tomcat8-war-runner/src/main/java/org/apache/tomcat/maven/runner/PasswordUtil.java
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java?rev=1854802=1854801=1854802=diff
==
---
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
(original)
+++
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManager.java
Tue Mar 5 00:28:07 2019
@@ -60,7 +60,7 @@ import java.util.Locale;
/**
* A Tomcat manager webapp invocation wrapper.
*
- * @author Mark Hobson
+ * @author Mark Hobson (markhob...@gmail.com)
*/
public class TomcatManager
{
@@ -277,7 +277,9 @@ public class TomcatManager
}
/**
- * @param proxy
+ * Sets the proxy to use when communicating with Tomcat manager.
+ *
+ * @param proxy the proxy to use when communicating with Tomcat manager
*/
public void setProxy( Proxy proxy )
{
@@ -422,14 +424,17 @@ public class TomcatManager
}
/**
- * @param path
- * @param war
- * @param update
- * @param tag
- * @param length
- * @return
- * @throws TomcatManagerException
- * @throws IOException
+ * Deploys the specified WAR as a HTTP PUT to the specified context path,
optionally undeploying the webapp if it
+ * already exists and using the specified tag name.
+ *
+ * @param path the webapp context path to deploy to
+ * @param waran input stream to the WAR to deploy
+ * @param update whether to first undeploy the webapp if it already exists
+ * @param tagthe tag name to use
+ * @param length the size of the war deployed
+ * @return the Tomcat manager response
+ * @throws TomcatManagerException if the Tomcat manager request fails
+ * @throws IOExceptionif an i/o error occurs
* @since 2.0
*/
public TomcatManagerResponse deploy( String path, File war, boolean
update, String tag, long length )
Modified:
tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/src/main/java/org/apache/tomcat/maven/common/deployer/TomcatManagerException.java
URL:
Re: Building and Testing Tomcat 7
Thanks Igal. Am 02.03.2019 um 23:08 schrieb Igal Sapir: Rainer, On Sat, Feb 16, 2019 at 2:42 PM Rainer Jung wrote: Hi Igal, Am 16.02.2019 um 22:10 schrieb Igal Sapir: Violeta, On Sat, Feb 16, 2019 at 9:41 AM Violeta Georgieva wrote: The proposed Apache Tomcat 7.0.93 release is now available for voting. I know that this is an issue with my environment, and not with Tomcat, but I wonder how you get it to download the dependencies with Java 6 since the ciphers in Java 6 are outdated (log excerpt below [1]). For the record, I downloaded JDK6, JDK7, and ANT1.8.4, set the path to JDK7 in build.properties, and JAVA_HOME and ANT_HOME to JDK6 and ANT1.8.4 respectively. My workaround is currently somethin like: export JAVA_HOME=/usr/local/jdk1.7.0 export ANT_OPTS="-Djavax.net.ssl.trustStore=/path/to/cacerts -Djavax.net.ssl.trustStorePassword=changeit -Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2" ant download-dist ant download-validate ant download-compile ant download-test-compile ant download-cobertura ant extras-commons-logging-prepare ant extras-webservices-prepare export JAVA_HOME=/usr/local/jdk1.6.0 export ANT_OPTS="-Djavax.net.ssl.trustStore=/path/to/cacerts -Djavax.net.ssl.trustStorePassword=changeit" ant release ant test I updated the build.xml file [1] to make this a bit simpler. The "download-compile" target was both downloading (requiring Java 8) and building (requiring Java 6), so I separated the two actions. To use the new update, you can now download all of the dependencies using the new "download-deps" target using Java 8+: $ export JAVA_HOME=/path-to-jdk8 $ ant download-deps Then you can set JAVA_HOME to a Java 6 version, ANT_HOME to a ant 1.8.x version (because newer ant will not run with Java 8), and run `ant deploy` or `ant test`. The way I do it is along the lines of: $ export JAVA_HOME=/path-to-jdk6 $ export ANT_HOME=/path-to-ant1.8.x $ export ANT_OPTS="-Djava.7.home=/path-toj-jdk7" $ ant test HTH someone, though I'm pretty sure that it will help my future self with testing the next update of Tomcat 7. Best, Igal [1] https://github.com/apache/tomcat/commit/6e69455ab09b Regards, Rainer [1] [get] Error getting https://repo.maven.apache.org/maven2/junit/junit/4.11/junit-4.11.jar to /home/ux/tomcat-build-libs/download-2104110046.tmp BUILD FAILED /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:2702: The following error occurred while executing this line: /home/ux/Downloads/apache-tomcat-7.0.93-src/build.xml:3066: javax.net.ssl.SSLException: Received fatal alert: protocol_version at com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:190) at com.sun.net.ssl.internal.ssl.Alerts.getSSLException(Alerts.java:136) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.recvAlert(SSLSocketImpl.java:1822) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.readRecord(SSLSocketImpl.java:1004) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.performInitialHandshake(SSLSocketImpl.java:1188) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1215) at com.sun.net.ssl.internal.ssl.SSLSocketImpl.startHandshake(SSLSocketImpl.java:1199) at sun.net.www.protocol.https.HttpsClient.afterConnect(HttpsClient.java:434) at sun.net.www.protocol.https.AbstractDelegateHttpsURLConnection.connect(AbstractDelegateHttpsURLConnection.java:166) at sun.net.www.protocol.https.HttpsURLConnectionImpl.connect(HttpsURLConnectionImpl.java:133) at org.apache.tools.ant.taskdefs.Get$GetThread.openConnection(Get.java:660) at org.apache.tools.ant.taskdefs.Get$GetThread.get(Get.java:579) at org.apache.tools.ant.taskdefs.Get$GetThread.run(Get.java:569) It can be obtained from: https://dist.apache.org/repos/dist/dev/tomcat/tomcat-7/v7.0.93/ The Maven staging repo is: https://repository.apache.org/content/repositories/orgapachetomcat-1204/ The svn tag is: http://svn.apache.org/repos/asf/tomcat/tc7.0.x/tags/TOMCAT_7_0_93/ The proposed 7.0.93 release is: [ ] Broken - do not release [ ] Stable - go ahead and release as 7.0.93 Stable Regards, Violeta - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-85-trunk
The Buildbot has detected a new failure on builder tomcat-85-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-85-trunk/builds/1679 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-85-commit' triggered this build Build Source Stamp: [branch 8.5.x] 4ccde94cd79791faeca6421512c51409770002b5 Blamelist: Mark Thomas 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
[Bug 63210] Tomcat failing to shutdown if EvictionTimer thread is running
https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 Mark Thomas changed: What|Removed |Added Resolution|--- |FIXED Status|NEW |RESOLVED --- Comment #11 from Mark Thomas --- Fixed in: - trunk for 9.0.17 onwards - 8.5.x for 8.5.39 onwards -- You are receiving this mail because: You are the assignee for the bug. - 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 https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
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 4ccde94 Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
4ccde94 is described below
commit 4ccde94cd79791faeca6421512c51409770002b5
Author: Mark Thomas
AuthorDate: Mon Mar 4 20:23:09 2019 +
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
Ensure that the Apache Commons DBCP 2 based default connection pool is
correctly shutdown when it is no longer required. This ensures that a
non-daemon thread is not left running that will prevent Tomcat from
shutting down cleanly.
---
java/org/apache/catalina/core/NamingContextListener.java| 8
java/org/apache/tomcat/util/descriptor/web/ContextResource.java | 6 ++
webapps/docs/changelog.xml | 6 ++
webapps/docs/config/context.xml | 6 +-
webapps/docs/config/globalresources.xml | 6 +-
5 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index dd734ac..fe5ad1c 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -60,6 +60,7 @@ import org.apache.naming.ResourceLinkRef;
import org.apache.naming.ResourceRef;
import org.apache.naming.ServiceRef;
import org.apache.naming.TransactionRef;
+import org.apache.naming.factory.Constants;
import org.apache.naming.factory.ResourceLinkFactory;
import org.apache.tomcat.util.descriptor.web.ContextEjb;
import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -1010,6 +1011,13 @@ public class NamingContextListener
if (("javax.sql.DataSource".equals(ref.getClassName()) ||
"javax.sql.XADataSource".equals(ref.getClassName())) &&
resource.getSingleton()) {
+String factory = (String) resource.getProperty("factory");
+if ((factory == null ||
factory.equals(Constants.DBCP_DATASOURCE_FACTORY)) &&
+!resource.getCloseMethodConfigured()) {
+// Using Tomcat's built-in factory (DBCP2) and DBCP2
DataSources
+// require an explicit close
+resource.setCloseMethod("close");
+}
try {
ObjectName on = createObjectName(resource);
Object actualResource = envCtx.lookup(resource.getName());
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
index affd9dd..60de9c1 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
@@ -85,15 +85,21 @@ public class ContextResource extends ResourceBase {
* collection.
*/
private String closeMethod = null;
+private boolean closeMethodConfigured = false;
public String getCloseMethod() {
return closeMethod;
}
public void setCloseMethod(String closeMethod) {
+closeMethodConfigured = true;
this.closeMethod = closeMethod;
}
+public boolean getCloseMethodConfigured() {
+return closeMethodConfigured;
+}
+
// - Public Methods
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index e620ee1..2a9fe56 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -89,6 +89,12 @@
maxLogMessageBufferSize that were accidentally removed.
(markt)
+
+63210: Ensure that the Apache Commons DBCP 2 based default
+connection pool is correctly shutdown when it is no longer required.
+This ensures that a non-daemon thread is not left running that will
+prevent Tomcat from shutting down cleanly. (markt)
+
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index c1861ec..c424a6f 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1203,7 +1203,11 @@
false. If not specified, no default is defined and no close method will
be called.
For Apache Commons DBCP 2 and Apache Tomcat JDBC connection pools
-you can use closeMethod="close".
+you can use closeMethod="close". Note that Apache Commons
+DBCP 2 requires this to be set for a clean shutdown. When using the
+default Tomcat connection pool (based on DBCP 2) Tomcat will set this
+attribute automatically unless it is explictly set to the empty
+string.
diff --git
[tomcat] branch master updated: Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
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 39b11dc Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
39b11dc is described below
commit 39b11dc314db8b78c0a9ac67eda5cb0179462eb2
Author: Mark Thomas
AuthorDate: Mon Mar 4 20:23:09 2019 +
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=63210
Ensure that the Apache Commons DBCP 2 based default connection pool is
correctly shutdown when it is no longer required. This ensures that a
non-daemon thread is not left running that will prevent Tomcat from
shutting down cleanly.
---
java/org/apache/catalina/core/NamingContextListener.java| 8
java/org/apache/tomcat/util/descriptor/web/ContextResource.java | 6 ++
webapps/docs/changelog.xml | 6 ++
webapps/docs/config/context.xml | 6 +-
webapps/docs/config/globalresources.xml | 6 +-
5 files changed, 30 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/catalina/core/NamingContextListener.java
b/java/org/apache/catalina/core/NamingContextListener.java
index 7bd69cd..5c124c8 100644
--- a/java/org/apache/catalina/core/NamingContextListener.java
+++ b/java/org/apache/catalina/core/NamingContextListener.java
@@ -60,6 +60,7 @@ import org.apache.naming.ResourceLinkRef;
import org.apache.naming.ResourceRef;
import org.apache.naming.ServiceRef;
import org.apache.naming.TransactionRef;
+import org.apache.naming.factory.Constants;
import org.apache.naming.factory.ResourceLinkFactory;
import org.apache.tomcat.util.descriptor.web.ContextEjb;
import org.apache.tomcat.util.descriptor.web.ContextEnvironment;
@@ -1010,6 +1011,13 @@ public class NamingContextListener
if (("javax.sql.DataSource".equals(ref.getClassName()) ||
"javax.sql.XADataSource".equals(ref.getClassName())) &&
resource.getSingleton()) {
+String factory = (String) resource.getProperty("factory");
+if ((factory == null ||
factory.equals(Constants.DBCP_DATASOURCE_FACTORY)) &&
+!resource.getCloseMethodConfigured()) {
+// Using Tomcat's built-in factory (DBCP2) and DBCP2
DataSources
+// require an explicit close
+resource.setCloseMethod("close");
+}
try {
ObjectName on = createObjectName(resource);
Object actualResource = envCtx.lookup(resource.getName());
diff --git a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
index f31905a..dd3de30 100644
--- a/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
+++ b/java/org/apache/tomcat/util/descriptor/web/ContextResource.java
@@ -85,15 +85,21 @@ public class ContextResource extends ResourceBase {
* collection.
*/
private String closeMethod = null;
+private boolean closeMethodConfigured = false;
public String getCloseMethod() {
return closeMethod;
}
public void setCloseMethod(String closeMethod) {
+closeMethodConfigured = true;
this.closeMethod = closeMethod;
}
+public boolean getCloseMethodConfigured() {
+return closeMethodConfigured;
+}
+
// - Public Methods
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 6833050..279096a 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -63,6 +63,12 @@
maxLogMessageBufferSize that were accidentally removed.
(markt)
+
+63210: Ensure that the Apache Commons DBCP 2 based default
+connection pool is correctly shutdown when it is no longer required.
+This ensures that a non-daemon thread is not left running that will
+prevent Tomcat from shutting down cleanly. (markt)
+
diff --git a/webapps/docs/config/context.xml b/webapps/docs/config/context.xml
index b84d79e..27a49a4 100644
--- a/webapps/docs/config/context.xml
+++ b/webapps/docs/config/context.xml
@@ -1215,7 +1215,11 @@
false. If not specified, no default is defined and no close method will
be called.
For Apache Commons DBCP 2 and Apache Tomcat JDBC connection pools
-you can use closeMethod="close".
+you can use closeMethod="close". Note that Apache Commons
+DBCP 2 requires this to be set for a clean shutdown. When using the
+default Tomcat connection pool (based on DBCP 2) Tomcat will set this
+attribute automatically unless it is explictly set to the empty
+string.
diff --git
[Bug 63210] Tomcat failing to shutdown if EvictionTimer thread is running
https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 --- Comment #10 from Mark Thomas --- DBCP2 (actually Pool2) requires explicit shutdown and is documented as such. If it is shutdown (via closeMethod="close") then the Evictor thread is stopped. My current thinking is to set closeMethod="close" if we create a DataSource resource using the built-in factory and to do so in such as way that the user can override it if they wish. I need to test this works as expected. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854779 - in /tomcat/maven-plugin/trunk: tomcat8-maven-plugin/ tomcat8-war-runner/
Author: ebourg Date: Mon Mar 4 16:57:52 2019 New Revision: 1854779 URL: http://svn.apache.org/viewvc?rev=1854779=rev Log: Ignore the IntelliJ project files Modified: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/ (props changed) tomcat/maven-plugin/trunk/tomcat8-war-runner/ (props changed) Propchange: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/ -- --- svn:ignore (original) +++ svn:ignore Mon Mar 4 16:57:52 2019 @@ -1 +1,2 @@ target +*.iml Propchange: tomcat/maven-plugin/trunk/tomcat8-war-runner/ -- --- svn:ignore (original) +++ svn:ignore Mon Mar 4 16:57:52 2019 @@ -1 +1,2 @@ target +*.iml - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854778 - in /tomcat/maven-plugin/trunk: common-tomcat-maven-plugin/pom.xml pom.xml
Author: ebourg Date: Mon Mar 4 16:57:04 2019 New Revision: 1854778 URL: http://svn.apache.org/viewvc?rev=1854778=rev Log: Removed the unused dependency on Guava Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml tomcat/maven-plugin/trunk/pom.xml Modified: tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml?rev=1854778=1854777=1854778=diff == --- tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml (original) +++ tomcat/maven-plugin/trunk/common-tomcat-maven-plugin/pom.xml Mon Mar 4 16:57:04 2019 @@ -50,11 +50,6 @@ - com.google.guava - guava - - - commons-io commons-io Modified: tomcat/maven-plugin/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1854778=1854777=1854778=diff == --- tomcat/maven-plugin/trunk/pom.xml (original) +++ tomcat/maven-plugin/trunk/pom.xml Mon Mar 4 16:57:04 2019 @@ -621,11 +621,6 @@ plexus-classworlds 2.2.2 - -com.google.guava -guava -10.0.1 - - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854777 - in /tomcat/maven-plugin/trunk: ./ src/site/apt/ tomcat-maven-archetype/src/main/resources/archetype-resources/ tomcat-maven-archetype/src/main/resources/archetype-resources/__ro
Author: ebourg
Date: Mon Mar 4 16:52:29 2019
New Revision: 1854777
URL: http://svn.apache.org/viewvc?rev=1854777=rev
Log:
Removed the Tomcat 6 plugin
Removed:
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/simple-war-project/
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/tomcat-run-multi-config/
tomcat/maven-plugin/trunk/tomcat-maven-plugin-it/src/main/resources/usage-contextpath/
tomcat/maven-plugin/trunk/tomcat6-maven-plugin/
Modified:
tomcat/maven-plugin/trunk/README.txt
tomcat/maven-plugin/trunk/pom.xml
tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm
tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt
tomcat/maven-plugin/trunk/src/site/apt/context-goals.apt
tomcat/maven-plugin/trunk/src/site/apt/index.apt.vm
tomcat/maven-plugin/trunk/src/site/apt/run-mojo-features.apt.vm
tomcat/maven-plugin/trunk/src/site/apt/snapshot-test.apt.vm
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/__rootArtifactId__-webapp/pom.xml
tomcat/maven-plugin/trunk/tomcat-maven-archetype/src/main/resources/archetype-resources/pom.xml
tomcat/maven-plugin/trunk/tomcat7-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat7/run/AbstractRunMojo.java
tomcat/maven-plugin/trunk/tomcat8-maven-plugin/src/main/java/org/apache/tomcat/maven/plugin/tomcat8/run/AbstractRunMojo.java
Modified: tomcat/maven-plugin/trunk/README.txt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/README.txt?rev=1854777=1854776=1854777=diff
==
--- tomcat/maven-plugin/trunk/README.txt (original)
+++ tomcat/maven-plugin/trunk/README.txt Mon Mar 4 16:52:29 2019
@@ -48,7 +48,7 @@ To test staging artifacts for a vote pro
* pass staging repository as parameter: -DtcStagedReleaseUrl=
* pass tomcat version as parameter: -Dtomcat7Version=
-Sample for tomcat7 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat7Version=7.x
+Sample for tomcat8 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat8Version=8.x
-Sample for tomcat6 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat6Version=6.x
+Sample for tomcat7 artifacts: mvn clean install -Prun-its -Ptc-staging
-DtcStagedReleaseUrl=stagingrepositoryurl -Dtomcat7Version=7.x
Modified: tomcat/maven-plugin/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/pom.xml?rev=1854777=1854776=1854777=diff
==
--- tomcat/maven-plugin/trunk/pom.xml (original)
+++ tomcat/maven-plugin/trunk/pom.xml Mon Mar 4 16:52:29 2019
@@ -320,7 +320,6 @@
common-tomcat-maven-plugin
tomcat-maven-plugin-it
-tomcat6-maven-plugin
tomcat7-war-runner
tomcat7-maven-plugin
tomcat8-war-runner
@@ -898,8 +897,8 @@
-http://tomcat.apache.org/tomcat-6.0-doc/api/
http://tomcat.apache.org/tomcat-7.0-doc/api/
+http://tomcat.apache.org/tomcat-8.0-doc/api/
true
true
Modified: tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm?rev=1854777=1854776=1854777=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/archetype.apt.vm Mon Mar 4 16:52:29
2019
@@ -98,7 +98,7 @@ public interface HelloService
** Running the webapp
- From the top directory, you can use: mvn tomcat6:run or mvn tomcat7:run
(depends on tomcat version you want).
+ From the top directory, you can use: mvn tomcat7:run or mvn tomcat8:run
(depends on tomcat version you want).
Now hit your browser http://localhost:9090 and you will use a very
complicated hello world webapp sample
Modified: tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt
URL:
http://svn.apache.org/viewvc/tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt?rev=1854777=1854776=1854777=diff
==
--- tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt (original)
+++ tomcat/maven-plugin/trunk/src/site/apt/container-goals.apt Mon Mar 4
16:52:29 2019
@@ -49,7 +49,7 @@ Container Goals
To list all the currently deployed applications in Tomcat you can type:
+--
-mvn tomcat6:list
+mvn tomcat7/8:list
+--
* {Listing server information}
@@ -58,7 +58,7 @@ mvn tomcat6:list
type:
+--
-mvn tomcat6:info
+mvn tomcat7/8:info
+--
* {Listing JNDI resources}
@@ -66,13 +66,13 @@ mvn tomcat6:info
To list all the JNDI resources available within
svn commit: r1854776 - in /tomcat/maven-plugin/trunk: tomcat8-maven-plugin/ tomcat8-war-runner/
Author: ebourg Date: Mon Mar 4 16:47:18 2019 New Revision: 1854776 URL: http://svn.apache.org/viewvc?rev=1854776=rev Log: Ignore the build directories for the Tomcat 8 plugin Modified: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/ (props changed) tomcat/maven-plugin/trunk/tomcat8-war-runner/ (props changed) Propchange: tomcat/maven-plugin/trunk/tomcat8-maven-plugin/ -- --- svn:ignore (added) +++ svn:ignore Mon Mar 4 16:47:18 2019 @@ -0,0 +1 @@ +target Propchange: tomcat/maven-plugin/trunk/tomcat8-war-runner/ -- --- svn:ignore (added) +++ svn:ignore Mon Mar 4 16:47:18 2019 @@ -0,0 +1 @@ +target - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63210] Tomcat failing to shutdown if EvictionTimer thread is running
https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 --- Comment #9 from Mark Thomas --- I am able to recreate the locally. Still investigating the root cause as I'd expect the DataSource to be shutdown cleanly when the web application stops. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63191] RemoteEndpoint.Async#sendText(String, SendHandler) never calls the callback
https://bz.apache.org/bugzilla/show_bug.cgi?id=63191 --- Comment #8 from Boris Petrov --- java.lang.Exception at org.cometd.websocket.server.WebSocketEndPoint$Delegate.send(WebSocketEndPoint.java:102) at org.cometd.websocket.server.common.AbstractWebSocketEndPoint$Flusher.process(AbstractWebSocketEndPoint.java:500) at org.eclipse.jetty.util.IteratingCallback.processing(IteratingCallback.java:241) at org.eclipse.jetty.util.IteratingCallback.succeeded(IteratingCallback.java:365) at org.cometd.websocket.server.WebSocketEndPoint$Delegate.lambda$send$0(WebSocketEndPoint.java:113) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase$TextMessageSendHandler.onResult(WsRemoteEndpointImplBase.java:811) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase.endMessage(WsRemoteEndpointImplBase.java:417) at org.apache.tomcat.websocket.WsRemoteEndpointImplBase$EndMessageHandler.onResult(WsRemoteEndpointImplBase.java:532) at org.apache.tomcat.websocket.server.WsRemoteEndpointImplServer$OnResultRunnable.run(WsRemoteEndpointImplServer.java:320) at java.base/java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1128) at java.base/java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:628) at org.apache.tomcat.util.threads.TaskThread$WrappingRunnable.run(TaskThread.java:61) at java.base/java.lang.Thread.run(Thread.java:834) This is the stacktrace of the thread that calls "sendText". Unfortunately it's not very useful I think. Or is it? It is exactly the same as many before it which have successfully called the callback. Any ideas? -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63223] org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams
https://bz.apache.org/bugzilla/show_bug.cgi?id=63223 TehKantz changed: What|Removed |Added Resolution|INVALID |--- Status|RESOLVED|REOPENED --- Comment #2 from TehKantz --- This is is the configuration used for the ssl connection as part of the tomcat server.xml template: I am not sure that the behavior is correct. when it happens, the server gets into a blocking state rejecting requests from all users across all WebApps, and the only way to stop it is killing the process. It Doesn't seems to be a desired behaviour, on top of that the logs created from this are insane it blocks the IO of the server make it even harder to shutdown the process -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] rmaucher commented on issue #140: jdbc-pool: Improve maxAge handling
rmaucher commented on issue #140: jdbc-pool: Improve maxAge handling URL: https://github.com/apache/tomcat/pull/140#issuecomment-469260446 I think maxAge is ok, but then the pool should indeed have at least minIdle. Basically, if you have 0 active, then you have at least minIdle, that sounds intuitive to me. I'm not doing the pool btw, just commenting based off the thread pool configurations. 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63210] Tomcat failing to shutdown if EvictionTimer thread is running
https://bz.apache.org/bugzilla/show_bug.cgi?id=63210 --- Comment #8 from Mark Thomas --- The proposed patch is not the correct solution. It addresses issue #1 in the original description but the real problem appears to be issue #2. If issue #2 is fixed then issue #1 will be fixed too. I'm looking to see if I can reproduce this locally. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[GitHub] [tomcat] toby1984 commented on issue #140: jdbc-pool: Improve maxAge handling
toby1984 commented on issue #140: jdbc-pool: Improve maxAge handling URL: https://github.com/apache/tomcat/pull/140#issuecomment-469229642 Could you please elaborate what you meant by your reference to the "maxIdle" and "initialSize" options ? How do they relate to the "maxAge" one in your opinion ? 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 With regards, Apache Git Services - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[Bug 63223] org.apache.coyote.http2.Http2UpgradeHandler.pruneClosedStreams
https://bz.apache.org/bugzilla/show_bug.cgi?id=63223 Mark Thomas changed: What|Removed |Added Status|NEW |RESOLVED Resolution|--- |INVALID --- Comment #1 from Mark Thomas --- That behaviour looks to be correct. The client for Connection 3442 has exceeded the maximum number of open streams per connection so subsequent requests to open a new stream are rejected. Please follow the up on the users@ mailing list where you can provide more details about the use case and potential configuration changes can be discussed. If further investigation does identify a Tomcat bug then this issue can be re-opened. -- You are receiving this mail because: You are the assignee for the bug. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
java.lang.NullPointerException on sun.nio.ch.Util.getTemporaryDirectBuffer
I get the exception in tomcat 8.5.19 Error processing request java.lang.NullPointerException at sun.nio.ch.Util.getTemporaryDirectBuffer(Util.java:230) at sun.nio.ch.IOUtil.write(IOUtil.java:58) at sun.nio.ch.SocketChannelImpl.write(SocketChannelImpl.java:471) at org.apache.tomcat.util.net.NioChannel.write(NioChannel.java:134) at org.apache.tomcat.util.net.NioBlockingSelector.write(NioBlockingSelector.java:101) at org.apache.tomcat.util.net.NioSelectorPool.write(NioSelectorPool.java:157) at org.apache.tomcat.util.net.NioEndpoint$NioSocketWrapper.doWrite(NioEndpoint.java:1262) at org.apache.tomcat.util.net.SocketWrapperBase.doWrite(SocketWrapperBase.java:670) at org.apache.tomcat.util.net.SocketWrapperBase.flushBlocking(SocketWrapperBase.java:607) at org.apache.tomcat.util.net.SocketWrapperBase.flush(SocketWrapperBase.java:597) at org.apache.coyote.http11.Http11OutputBuffer.flushBuffer(Http11OutputBuffer.java:581) at org.apache.coyote.http11.Http11OutputBuffer.finishResponse(Http11OutputBuffer.java:330) at org.apache.coyote.http11.Http11Processor.finishResponse(Http11Processor.java:1488) Looking forward to some help. thinks. -- ?? ?? ?? 11??605?? ??215000 ??+86 18860923261 ??jianjun@dev.bessystem.com
Re: JDK 12: First Release Candidate available
Hi Mark, Can you update the bug , using your JBS account, with the latest information you have etc. I'll check from this end. Rgds,Rory On 01/03/2019 21:28, Mark Thomas wrote: Rory, We have received a report [1] of users being affected by a known JRE bug [2]. I've done some local testing and I believe it affects all current Java versions. We can work-around it but it would be much better if this was fixed in the JRE. Is there any chance the priority of [2] could be bumped up? Thanks, Mark [1] https://bz.apache.org/bugzilla/show_bug.cgi?id=63205 [2] https://bugs.openjdk.java.net/browse/JDK-8157404 -- Rgds,Rory O'Donnell Quality Engineering Manager Oracle EMEA , Dublin, Ireland - 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: Avoid API change by adding back deprecated methods
This is an automated email from the ASF dual-hosted git repository.
remm 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 a7e3b90 Avoid API change by adding back deprecated methods
a7e3b90 is described below
commit a7e3b905fdc13fd426b8e6e9c8673e26282f8a18
Author: remm
AuthorDate: Mon Mar 4 10:13:02 2019 +0100
Avoid API change by adding back deprecated methods
---
java/org/apache/tomcat/util/net/SocketWrapperBase.java | 16
1 file changed, 16 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
index 4f40afd..df84510 100644
--- a/java/org/apache/tomcat/util/net/SocketWrapperBase.java
+++ b/java/org/apache/tomcat/util/net/SocketWrapperBase.java
@@ -971,6 +971,14 @@ public abstract class SocketWrapperBase {
return true;
}
+@Deprecated
+public final CompletionState read(boolean block, long timeout,
+TimeUnit unit, A attachment, CompletionCheck check,
+CompletionHandler handler, ByteBuffer... dsts) {
+return read(block ? BlockingMode.BLOCK : BlockingMode.NON_BLOCK,
+timeout, unit, attachment, check, handler, dsts);
+}
+
/**
* Scatter read. The completion handler will be called once some
* data has been read or an error occurred. If a CompletionCheck
@@ -1028,6 +1036,14 @@ public abstract class SocketWrapperBase {
throw new UnsupportedOperationException();
}
+@Deprecated
+public final CompletionState write(boolean block, long timeout,
+TimeUnit unit, A attachment, CompletionCheck check,
+CompletionHandler handler, ByteBuffer... srcs) {
+return write(block ? BlockingMode.BLOCK : BlockingMode.NON_BLOCK,
+timeout, unit, attachment, check, handler, srcs);
+}
+
/**
* Gather write. The completion handler will be called once some
* data has been written or an error occurred. If a CompletionCheck
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jakarta EE TCKs and compatibility logo
I was a bit struggle building it... But ATM I only need binaries so that's perfect. Thanks a lot for the informations! On Mon, 4 Mar 2019 at 19:00, Mark Thomas wrote: > On 04/03/2019 08:43, Mark Thomas wrote: > > On 04/03/2019 08:34, Olivier Lamy wrote: > >> Hi Mark, > >> The download link doesn't work (404) > > > > Looks like they have moved things around a bit. Try starting from > > https://download.eclipse.org/ee4j/jakartaee-tck/8.0.1/?d > > > >> Do you have any idea about how to build or download to execute > servlet/jsp > >> tck part? > > > > All the notes we have - including known TCK bugs and expected failures > > are on the wiki > > https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs > > > > The bugs we have reported are getting fixed but those fixes are only > > going into the master branch not the 8.0.1 branch. > > > > I need to go digging to see if I can find a download location for > > standalone builds for the master branch. > > Latest builds of master: > > https://jenkins.eclipse.org/jakartaee-tck/job/standalonetck-nightly-build-run/lastSuccessfulBuild/artifact/standalone-bundles/ > > From a quick glance, these look to be the Jakarta EE 8 TCKs with the > various bugs we have reported fixed. I haven't been through a diff > between master and the EE4J8 branch to confirm that though. > > I'm running the TCKs where I'd expect to see fixed bugs now. I'll update > the wiki with progress. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Olivier Lamy http://twitter.com/olamy | http://linkedin.com/in/olamy
[GUMP@vmgump-vm3]: Project tomcat-tc8.5.x-test-nio2 (in module tomcat-8.5.x) failed
To whom it may engage... This is an automated request, but not an unsolicited one. For more information please visit http://gump.apache.org/nagged.html, and/or contact the folk at gene...@gump.apache.org. Project tomcat-tc8.5.x-test-nio2 has an issue affecting its community integration. This issue affects 1 projects. The current state of this project is 'Failed', with reason 'Build Failed'. For reference only, the following projects are affected by this: - tomcat-tc8.5.x-test-nio2 : Tomcat 8.x, a web server implementing the Java Servlet 3.1, ... Full details are available at: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/index.html That said, some information snippets are provided here. The following annotations (debug/informational/warning/error messages) were provided: -INFO- Failed with reason build failed -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.5.x/output/logs-NIO2 -INFO- Project Reports in: /srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs -WARNING- No directory [/srv/gump/public/workspace/tomcat-8.5.x/output/test-tmp-NIO2/logs] The following work was performed: http://vmgump-vm3.apache.org/tomcat-8.5.x/tomcat-tc8.5.x-test-nio2/gump_work/build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2.html Work Name: build_tomcat-8.5.x_tomcat-tc8.5.x-test-nio2 (Type: Build) Work ended in a state of : Failed Elapsed: 18 mins 46 secs Command Line: /usr/lib/jvm/java-8-oracle/bin/java -Djava.awt.headless=true -Dbuild.sysclasspath=only -Dsun.zip.disableMemoryMapping=true org.apache.tools.ant.Main -Dgump.merge=/srv/gump/public/gump/work/merge.xml -Djunit.jar=/srv/gump/public/workspace/junit/target/junit-4.13-SNAPSHOT.jar -Djava.net.preferIPv4Stack=/srv/gump/public/workspace/tomcat-8.5.x/true -Dobjenesis.jar=/srv/gump/public/workspace/objenesis/main/target/objenesis-3.1-SNAPSHOT.jar -Dtest.reports=output/logs-NIO2 -Dexecute.test.nio2=true -Dexamples.sources.skip=true -Dbase.path=/srv/gump/public/workspace/tomcat-8.5.x/tomcat-build-libs -Djdt.jar=/srv/gump/packages/eclipse/plugins/R-4.7.3a-201803300640/ecj-4.7.3a.jar -Dtest.relaxTiming=true -Dcommons-daemon.jar=/srv/gump/public/workspace/apache-commons/daemon/target/commons-daemon-1.1.1-SNAPSHOT.jar -Dtest.temp=output/test-tmp-NIO2 -Dtest.accesslog=true -Dexecute.test.nio=false -Dtest.openssl.path=/srv/gump/public/workspace/openssl-1.1.1/dest-20190304/bin/openssl -Dexe cute.test.bio=false -Dexecute.test.apr=false -Dtest.excludePerformance=true -Deasymock.jar=/srv/gump/packages/easymock3/easymock-3.6.jar -Dhamcrest.jar=/srv/gump/packages/hamcrest/hamcrest-core-1.3.jar -Dcglib.jar=/srv/gump/packages/cglib/cglib-nodep-2.2.jar test [Working Directory: /srv/gump/public/workspace/tomcat-8.5.x] CLASSPATH: /usr/lib/jvm/java-8-oracle/lib/tools.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/webapps/examples/WEB-INF/classes:/srv/gump/public/workspace/tomcat-8.5.x/output/testclasses:/srv/gump/public/workspace/ant/dist/lib/ant.jar:/srv/gump/public/workspace/ant/dist/lib/ant-launcher.jar:/srv/gump/public/workspace/ant/dist/lib/ant-jmf.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit.jar:/srv/gump/public/workspace/ant/dist/lib/ant-junit4.jar:/srv/gump/public/workspace/ant/dist/lib/ant-swing.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-resolver.jar:/srv/gump/public/workspace/ant/dist/lib/ant-apache-xalan2.jar:/srv/gump/public/workspace/xml-commons/java/build/resolver.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/bootstrap.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/bin/tomcat-juli.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/annotations-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/servlet-api.ja r:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jsp-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/el-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/websocket-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jaspic-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ant.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-storeconfig.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-coyote.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/jasper-el.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-tribes.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/catalina-ha.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-api.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/bu ild/lib/tomcat-jni.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util.jar:/srv/gump/public/workspace/tomcat-8.5.x/output/build/lib/tomcat-util-scan.jar:/srv/gump/public/workspace/tomcat-8.5.x
Re: Jakarta EE TCKs and compatibility logo
On 04/03/2019 08:43, Mark Thomas wrote: > On 04/03/2019 08:34, Olivier Lamy wrote: >> Hi Mark, >> The download link doesn't work (404) > > Looks like they have moved things around a bit. Try starting from > https://download.eclipse.org/ee4j/jakartaee-tck/8.0.1/?d > >> Do you have any idea about how to build or download to execute servlet/jsp >> tck part? > > All the notes we have - including known TCK bugs and expected failures > are on the wiki > https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs > > The bugs we have reported are getting fixed but those fixes are only > going into the master branch not the 8.0.1 branch. > > I need to go digging to see if I can find a download location for > standalone builds for the master branch. Latest builds of master: https://jenkins.eclipse.org/jakartaee-tck/job/standalonetck-nightly-build-run/lastSuccessfulBuild/artifact/standalone-bundles/ >From a quick glance, these look to be the Jakarta EE 8 TCKs with the various bugs we have reported fixed. I haven't been through a diff between master and the EE4J8 branch to confirm that though. I'm running the TCKs where I'd expect to see fixed bugs now. I'll update the wiki with progress. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jakarta EE TCKs and compatibility logo
On 04/03/2019 08:34, Olivier Lamy wrote: > Hi Mark, > The download link doesn't work (404) Looks like they have moved things around a bit. Try starting from https://download.eclipse.org/ee4j/jakartaee-tck/8.0.1/?d > Do you have any idea about how to build or download to execute servlet/jsp > tck part? All the notes we have - including known TCK bugs and expected failures are on the wiki https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs The bugs we have reported are getting fixed but those fixes are only going into the master branch not the 8.0.1 branch. I need to go digging to see if I can find a download location for standalone builds for the master branch. Mark > Thanks > Olivier > > On Mon, 18 Feb 2019 at 05:01, Mark Thomas wrote: > >> Ping. >> >> Just a gentle reminder as I haven't seen any emails to jcp-open@ as yet. >> >> Mark >> >> PS If you don't want to build from source, there are nightly TCK builds >> available here: >> https://download.eclipse.org/ee4j/jakartaee-tck/8.0.1/nightly/ >> >> >> On 21/01/2019 10:46, Mark Thomas wrote: >>> Apologies for the noise. >>> >>> The correct link for [3] is: >>> >>> https://jakarta.ee/legal/trademark_guidelines/ >>> >>> I've also corrected a handful of the project BCCs. >>> >>> Mark >>> >>> >>> On 18/01/2019 22:53, Mark Thomas wrote: Hi all, I am writing to your dev@ lists (on BCC) as your project has, in the past, requested access to the Java EE TCKs while they were controlled by Sun and then Oracle. As I am sure you are aware, Java EE has moved to Eclipse and is now Jakarta EE. The good news is that the TCKs have been open sourced. https://github.com/eclipse-ee4j/jakartaee-tck (I haven't tried to build the latest TCK from source yet but it is on my TODO list.) Shipping compatible implementations of the Jakarta EE specs (and being able to make public statements to that effect) will be subject only to the spec [1] and TCK [2] licenses. There will no longer be a TCK agreement or NDA to sign. However... The question has arisen whether or not any ASF projects will want to use the Jakarta EE compatible logo [3]. If a project wants to be able to do this, there are some organisational hoops to jump through. Before the ASF starts down that path the board has asked me to see if there are any projects that want to use the Jakarta EE compatible logo. After all, there is no point jumping through the hoops if no-one wants to use the >> logo. With the above in mind can you please discuss this amongst your project community and reply back to jcp-o...@apache.org whether or not your project is interested in being able to use the Jakarta EE compatible logo. I ask that you complete this no later than the next board meeting (20th February 2019). If you have any questions about any of the above, please also use jcp-o...@apache.org to ask them. Thanks, Mark [1] https://www.eclipse.org/legal/efsl.php [2] https://www.eclipse.org/legal/tck.php [3] https://www.eclipse.org/legal/tck.php >>> >> >> >> - >> 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 8.5.x updated: Remove unused imports
This is an automated email from the ASF dual-hosted git repository. remm 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 23b82ee Remove unused imports 23b82ee is described below commit 23b82ee368ea3a7bb7986b4fa1db288fb5fa8b6c Author: remm AuthorDate: Mon Mar 4 09:39:10 2019 +0100 Remove unused imports --- test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java index 6d4e310..8acffa7 100644 --- a/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java +++ b/test/org/apache/catalina/nonblocking/TestNonBlockingAPI.java @@ -49,12 +49,10 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.junit.Assert; -import org.junit.Assume; import org.junit.Ignore; import org.junit.Test; import org.apache.catalina.Context; -import org.apache.catalina.connector.Connector; import org.apache.catalina.startup.BytesStreamer; import org.apache.catalina.startup.TesterServlet; import org.apache.catalina.startup.Tomcat; - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Jakarta EE TCKs and compatibility logo
Hi Mark, The download link doesn't work (404) Do you have any idea about how to build or download to execute servlet/jsp tck part? Thanks Olivier On Mon, 18 Feb 2019 at 05:01, Mark Thomas wrote: > Ping. > > Just a gentle reminder as I haven't seen any emails to jcp-open@ as yet. > > Mark > > PS If you don't want to build from source, there are nightly TCK builds > available here: > https://download.eclipse.org/ee4j/jakartaee-tck/8.0.1/nightly/ > > > On 21/01/2019 10:46, Mark Thomas wrote: > > Apologies for the noise. > > > > The correct link for [3] is: > > > > https://jakarta.ee/legal/trademark_guidelines/ > > > > I've also corrected a handful of the project BCCs. > > > > Mark > > > > > > On 18/01/2019 22:53, Mark Thomas wrote: > >> Hi all, > >> > >> I am writing to your dev@ lists (on BCC) as your project has, in the > >> past, requested access to the Java EE TCKs while they were controlled by > >> Sun and then Oracle. > >> > >> As I am sure you are aware, Java EE has moved to Eclipse and is now > >> Jakarta EE. The good news is that the TCKs have been open sourced. > >> > >> https://github.com/eclipse-ee4j/jakartaee-tck > >> > >> (I haven't tried to build the latest TCK from source yet but it is on my > >> TODO list.) > >> > >> Shipping compatible implementations of the Jakarta EE specs (and being > >> able to make public statements to that effect) will be subject only to > >> the spec [1] and TCK [2] licenses. There will no longer be a TCK > >> agreement or NDA to sign. However... > >> > >> The question has arisen whether or not any ASF projects will want to use > >> the Jakarta EE compatible logo [3]. If a project wants to be able to do > >> this, there are some organisational hoops to jump through. Before the > >> ASF starts down that path the board has asked me to see if there are any > >> projects that want to use the Jakarta EE compatible logo. After all, > >> there is no point jumping through the hoops if no-one wants to use the > logo. > >> > >> With the above in mind can you please discuss this amongst your project > >> community and reply back to jcp-o...@apache.org whether or not your > >> project is interested in being able to use the Jakarta EE compatible > >> logo. I ask that you complete this no later than the next board meeting > >> (20th February 2019). > >> > >> If you have any questions about any of the above, please also use > >> jcp-o...@apache.org to ask them. > >> > >> Thanks, > >> > >> Mark > >> > >> > >> [1] https://www.eclipse.org/legal/efsl.php > >> [2] https://www.eclipse.org/legal/tck.php > >> [3] https://www.eclipse.org/legal/tck.php > >> > > > > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > > -- Olivier Lamy http://twitter.com/olamy | http://linkedin.com/in/olamy
