Re: Git migration read for testing
Konstantin, On Tue, Feb 26, 2019 at 4:23 PM Konstantin Kolinko wrote: > вт, 26 февр. 2019 г. в 21:24, Igal Sapir : > > > > Mark, > > > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > > > > > > > > branches > > > - master (9.0.x) > > > - 8.5.x > > > - 7.0.x > > > > What are the plans for the tomcat-site? [...] > > Igal, > > If you look at a *-fulldocs.tar.gz file with full documentation that > accompanies each Tomcat release, > you'll find that e.g. for Tomcat 9.0.16 its unpacked size is 60 Mb, > with 2385 files in 165 directories. > > The full tomcat.apache.org site contains such documentation for every > major version of Tomcat. See all directories listed ar > http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ > > With Subversion it is easy to work with that, using "sparse checkout" > feature. The relevant commands are documented in site's README file. > Git is much more efficient than Subversion, as it only keeps a single copy of files that were unchanged. The new github repo takes on my drive 133.2 MiB for the 3 branches combined with the master branch checked out (125.6 MiB when the 7.0.x branch is checked out as less files get uncompressed). > > With some googling, it seems that Git also has some sparse checkout > support [1], but I am not sure whether it is as easy to use as this > feature in Subversion. > > (How does one manage the checkout layout? Is there a better way to > update the ".git/info/sparse-checkout" file rather than having to edit > it by manually? In Subversion the checkout depth can be changed easily > with "svn update --set-depth" command). > In Git you don't have to get a partial depth due to the efficiency mentioned above - you get the whole depth at no additional cost. If you have for example a file that hasn't been changed in any commit from 7.0.1 to 9.0.16 then Git keeps only one copy of it across all branches throughout the repository. > If people really want to use git for the site, I think the first step > it to create a Git mirror for the current site repository and to see > whether it is usable. > I have created a local git repo from the site branch. From what I see the most disk space goes for the JavaDoc sections, and some on the docs directory. These are generated files so they can be added to .gitignore and not tracked by Git. > At this point, I think that Subversion is better tool for managing the > site. I do not expect much from Git. > I agree with you that ideally the site should not be mixed with the source code. The tomcat-site should have its own repository. A GitHub search shows that the apache account has 94 repositories with `site` in the name [1]. So for example there are repos like `kafka-site` and `spark-website` in addition to the `kafka` and `spark` source code repositories. All we have to do is create a separate repo for the site, either `tomcat-website` or `tomcat-site`. I believe that INFRA takes care of that. Best, Igal [1] https://github.com/search?q=org%3Aapache+site=Repositories
[GUMP@vmgump-vm3]: Project taglibs-parent (in module tomcat-taglibs) 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 taglibs-parent has an issue affecting its community integration.
This issue affects 2 projects,
and has been outstanding for 12 runs.
The current state of this project is 'Failed', with reason 'Build Failed'.
For reference only, the following projects are affected by this:
- taglibs-parent : Taglib Parent POM
- taglibs-standard-spec : JSP Taglibs
Full details are available at:
http://vmgump-vm3.apache.org/tomcat-taglibs/taglibs-parent/index.html
That said, some information snippets are provided here.
The following annotations (debug/informational/warning/error messages) were
provided:
-DEBUG- Sole pom output [pom.xml] identifier set to project name
-INFO- Optional dependency commons-io failed with reason build failed
-DEBUG- (Apache Gump generated) Apache Maven Settings in:
/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml
-INFO- Failed with reason build failed
-DEBUG- Maven POM in:
/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/pom.xml
-DEBUG- Extracted fallback artifacts from Gump Repository
The following work was performed:
http://vmgump-vm3.apache.org/tomcat-taglibs/taglibs-parent/gump_work/build_tomcat-taglibs_taglibs-parent.html
Work Name: build_tomcat-taglibs_taglibs-parent (Type: Build)
Work ended in a state of : Failed
Elapsed: 2 mins 2 secs
Command Line: /opt/maven3/bin/mvn --batch-mode --settings
/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/gump_mvn_settings.xml
install
[Working Directory: /srv/gump/public/workspace/tomcat-taglibs/taglibs-parent]
M2_HOME: /opt/maven3
-
[INFO] Scanning for projects...
[INFO] Downloading:
http://localhost:8192/maven2/org/apache/apache/13/apache-13.pom
Feb 27, 2019 1:39:50 AM
org.apache.maven.wagon.providers.http.httpclient.impl.execchain.RetryExec
execute
INFO: I/O exception
(org.apache.maven.wagon.providers.http.httpclient.NoHttpResponseException)
caught when processing request to {}->http://localhost:8192: The target server
failed to respond
Feb 27, 2019 1:39:50 AM
org.apache.maven.wagon.providers.http.httpclient.impl.execchain.RetryExec
execute
INFO: Retrying request to {}->http://localhost:8192
Feb 27, 2019 1:40:20 AM
org.apache.maven.wagon.providers.http.httpclient.impl.execchain.RetryExec
execute
INFO: I/O exception
(org.apache.maven.wagon.providers.http.httpclient.NoHttpResponseException)
caught when processing request to {}->http://localhost:8192: The target server
failed to respond
Feb 27, 2019 1:40:20 AM
org.apache.maven.wagon.providers.http.httpclient.impl.execchain.RetryExec
execute
INFO: Retrying request to {}->http://localhost:8192
Feb 27, 2019 1:40:50 AM
org.apache.maven.wagon.providers.http.httpclient.impl.execchain.RetryExec
execute
INFO: I/O exception
(org.apache.maven.wagon.providers.http.httpclient.NoHttpResponseException)
caught when processing request to {}->http://localhost:8192: The target server
failed to respond
Feb 27, 2019 1:40:50 AM
org.apache.maven.wagon.providers.http.httpclient.impl.execchain.RetryExec
execute
INFO: Retrying request to {}->http://localhost:8192
[ERROR] [ERROR] Some problems were encountered while processing the POMs:
[WARNING] 'parent.relativePath' of POM
org.apache.taglibs:taglibs-parent:4-SNAPSHOT
(/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/pom.xml) points at
org.apache.tomcat.taglibs:taglibs-aggregator instead of org.apache:apache,
please verify your project structure @ line 20, column 11
[FATAL] Non-resolvable parent POM for
org.apache.taglibs:taglibs-parent:4-SNAPSHOT: Could not transfer artifact
org.apache:apache:pom:13 from/to gump-central (http://localhost:8192/maven2):
localhost:8192 failed to respond and 'parent.relativePath' points at wrong
local POM @ line 20, column 11
@
[ERROR] The build could not read 1 project -> [Help 1]
[ERROR]
[ERROR] The project org.apache.taglibs:taglibs-parent:4-SNAPSHOT
(/srv/gump/public/workspace/tomcat-taglibs/taglibs-parent/pom.xml) has 1 error
[ERROR] Non-resolvable parent POM for
org.apache.taglibs:taglibs-parent:4-SNAPSHOT: Could not transfer artifact
org.apache:apache:pom:13 from/to gump-central (http://localhost:8192/maven2):
localhost:8192 failed to respond and 'parent.relativePath' points at wrong
local POM @ line 20, column 11 -> [Help 2]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e
switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please
read the following articles:
[ERROR] [Help 1]
http://cwiki.apache.org/confluence/display/MAVEN/ProjectBuildingException
[ERROR] [Help 2]
Re: Git migration read for testing
вт, 26 февр. 2019 г. в 21:24, Igal Sapir : > > Mark, > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > > > All, > > > > https://github.com/apache/tomcat > > > > is now ready for testing. > > > > It should contain: > > branches > > - master (9.0.x) > > - 8.5.x > > - 7.0.x > > > > What are the plans for the tomcat-site? [...] Igal, If you look at a *-fulldocs.tar.gz file with full documentation that accompanies each Tomcat release, you'll find that e.g. for Tomcat 9.0.16 its unpacked size is 60 Mb, with 2385 files in 165 directories. The full tomcat.apache.org site contains such documentation for every major version of Tomcat. See all directories listed ar http://svn.apache.org/viewvc/tomcat/site/trunk/docs/ With Subversion it is easy to work with that, using "sparse checkout" feature. The relevant commands are documented in site's README file. With some googling, it seems that Git also has some sparse checkout support [1], but I am not sure whether it is as easy to use as this feature in Subversion. (How does one manage the checkout layout? Is there a better way to update the ".git/info/sparse-checkout" file rather than having to edit it by manually? In Subversion the checkout depth can be changed easily with "svn update --set-depth" command). If people really want to use git for the site, I think the first step it to create a Git mirror for the current site repository and to see whether it is usable. At this point, I think that Subversion is better tool for managing the site. I do not expect much from Git. [1] https://briancoyner.github.io/2013/06/05/git-sparse-checkout.html Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Remove further remains of the extras package.
ср, 27 февр. 2019 г. в 02:27, : > > This is an automated email from the ASF dual-hosted git repository. > > rjung 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 0752512 Remove further remains of the extras package. > 0752512 is described below > > commit 0752512ac27ab338371b72ded2b216d972091196 > Author: Rainer Jung > AuthorDate: Wed Feb 27 00:26:03 2019 +0100 > Congratulations! It does not really matter much, but note that you are not using an @apache.org e-mail in your commit info above. Best regards, Konstantin Kolinko - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: [tomcat] branch master updated: Remove further remains of the extras package.
Great migration job! Good stuff. My first commit seems to have worked. Regards, Rainer Am 27.02.2019 um 00:27 schrieb rj...@apache.org: This is an automated email from the ASF dual-hosted git repository. rjung 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 0752512 Remove further remains of the extras package. 0752512 is described below commit 0752512ac27ab338371b72ded2b216d972091196 Author: Rainer Jung AuthorDate: Wed Feb 27 00:26:03 2019 +0100 Remove further remains of the extras package. Addition to BZ63072, svn r1851231, git d1adef0be04bdba32840fc149b6796e27eee55b2. --- conf/catalina.properties | 2 -- res/welcome.bin.html | 11 --- res/welcome.main.html| 11 --- 3 files changed, 24 deletions(-) diff --git a/conf/catalina.properties b/conf/catalina.properties index 3b3bf58..289f697 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -115,10 +115,8 @@ aspectj*.jar,\ bootstrap.jar,\ catalina-ant.jar,\ catalina-ha.jar,\ -catalina-jmx-remote.jar,\ catalina-storeconfig.jar,\ catalina-tribes.jar,\ -catalina-ws.jar,\ catalina.jar,\ cglib-*.jar,\ cobertura-*.jar,\ diff --git a/res/welcome.bin.html b/res/welcome.bin.html index d3300db..7bc33dd 100644 --- a/res/welcome.bin.html +++ b/res/welcome.bin.html @@ -71,17 +71,6 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details. apache-tomcat-[version]-fulldocs.tar.gz The Tomcat documentation bundle, including complete javadocs. -bin/extras/ - - catalina-ws.jar -Web Services support (JSR 109). See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html;> -extras documentation for more information. - catalina-jmx-remote.jar -JMX Remote Lifecycle Listener. See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html;> -listeners documentation for details. - src/ apache-tomcat-[version].zip or .tar.gz diff --git a/res/welcome.main.html b/res/welcome.main.html index 93bd486..4598b2a 100644 --- a/res/welcome.main.html +++ b/res/welcome.main.html @@ -71,17 +71,6 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details. apache-tomcat-[version]-fulldocs.tar.gz The Tomcat documentation bundle, including complete javadocs. -bin/extras/ - - catalina-ws.jar -Web Services support (JSR 109). See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html;> -extras documentation for more information. - catalina-jmx-remote.jar -JMX Remote Lifecycle Listener. See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html;> -listeners documentation for details. - src/ apache-tomcat-[version].zip or .tar.gz -- kippdata informationstechnologie GmbH Tel: 0228 98549 -0 Bornheimer Str. 33aFax: 0228 98549 -50 53111 Bonn www.kippdata.de HRB 8018 Amtsgericht Bonn / USt.-IdNr. DE 196 457 417 Geschäftsführer: Dr. Thomas Höfer, Rainer Jung, Sven Maurmann - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Remove further remains of the extras package.
This is an automated email from the ASF dual-hosted git repository. rjung 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 0752512 Remove further remains of the extras package. 0752512 is described below commit 0752512ac27ab338371b72ded2b216d972091196 Author: Rainer Jung AuthorDate: Wed Feb 27 00:26:03 2019 +0100 Remove further remains of the extras package. Addition to BZ63072, svn r1851231, git d1adef0be04bdba32840fc149b6796e27eee55b2. --- conf/catalina.properties | 2 -- res/welcome.bin.html | 11 --- res/welcome.main.html| 11 --- 3 files changed, 24 deletions(-) diff --git a/conf/catalina.properties b/conf/catalina.properties index 3b3bf58..289f697 100644 --- a/conf/catalina.properties +++ b/conf/catalina.properties @@ -115,10 +115,8 @@ aspectj*.jar,\ bootstrap.jar,\ catalina-ant.jar,\ catalina-ha.jar,\ -catalina-jmx-remote.jar,\ catalina-storeconfig.jar,\ catalina-tribes.jar,\ -catalina-ws.jar,\ catalina.jar,\ cglib-*.jar,\ cobertura-*.jar,\ diff --git a/res/welcome.bin.html b/res/welcome.bin.html index d3300db..7bc33dd 100644 --- a/res/welcome.bin.html +++ b/res/welcome.bin.html @@ -71,17 +71,6 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details. apache-tomcat-[version]-fulldocs.tar.gz The Tomcat documentation bundle, including complete javadocs. -bin/extras/ - - catalina-ws.jar -Web Services support (JSR 109). See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html;> -extras documentation for more information. - catalina-jmx-remote.jar -JMX Remote Lifecycle Listener. See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html;> -listeners documentation for details. - src/ apache-tomcat-[version].zip or .tar.gz diff --git a/res/welcome.main.html b/res/welcome.main.html index 93bd486..4598b2a 100644 --- a/res/welcome.main.html +++ b/res/welcome.main.html @@ -71,17 +71,6 @@ RELEASE-NOTES and the RUNNING.txt file in the distribution for more details. apache-tomcat-[version]-fulldocs.tar.gz The Tomcat documentation bundle, including complete javadocs. -bin/extras/ - - catalina-ws.jar -Web Services support (JSR 109). See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/extras.html;> -extras documentation for more information. - catalina-jmx-remote.jar -JMX Remote Lifecycle Listener. See the https://tomcat.apache.org/tomcat-@VERSION_MAJOR_MINOR@-doc/config/listeners.html;> -listeners documentation for details. - src/ apache-tomcat-[version].zip or .tar.gz - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot success in on tomcat-trunk
The Buildbot has detected a restored build on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4083 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] b01e5258ea92efadd3b9505fed31d8bce46c1a46 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
svn commit: r1854428 - in /tomcat: archive/tc9.0.x/ archive/tc9.0.x/tags/ archive/tc9.0.x/trunk/ tags/ tc9.0.x/ trunk/
Author: markt Date: Tue Feb 26 22:35:20 2019 New Revision: 1854428 URL: http://svn.apache.org/viewvc?rev=1854428=rev Log: Move 9.0.x to the archive area after the migration to git Added: tomcat/archive/tc9.0.x/ - copied from r1854427, tomcat/tc9.0.x/ tomcat/archive/tc9.0.x/tags/ - copied from r1854427, tomcat/tags/ tomcat/archive/tc9.0.x/trunk/ - copied from r1854427, tomcat/trunk/ Removed: tomcat/tags/ tomcat/tc9.0.x/ tomcat/trunk/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854427 - in /tomcat: archive/tc8.5.x/ tc8.5.x/
Author: markt Date: Tue Feb 26 22:32:17 2019 New Revision: 1854427 URL: http://svn.apache.org/viewvc?rev=1854427=rev Log: Move 8.5.x to the archive area after the migration to git Added: tomcat/archive/tc8.5.x/ - copied from r1854426, tomcat/tc8.5.x/ Removed: tomcat/tc8.5.x/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854426 - in /tomcat: archive/tc7.0.x/ tc7.0.x/
Author: markt Date: Tue Feb 26 22:31:04 2019 New Revision: 1854426 URL: http://svn.apache.org/viewvc?rev=1854426=rev Log: Move 7.0.x to the archive area after the migration to git Added: tomcat/archive/tc7.0.x/ - copied from r1854425, tomcat/tc7.0.x/ Removed: tomcat/tc7.0.x/ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: SpotBugs: finalize() should be protected
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 b01e525 SpotBugs: finalize() should be protected
b01e525 is described below
commit b01e5258ea92efadd3b9505fed31d8bce46c1a46
Author: Mark Thomas
AuthorDate: Tue Feb 26 22:21:04 2019 +
SpotBugs: finalize() should be protected
Fix a minor SpotBugs issue to trigger a CI build as part of testing the
svn -> git migration
---
java/org/apache/catalina/tribes/group/RpcChannel.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/group/RpcChannel.java
b/java/org/apache/catalina/tribes/group/RpcChannel.java
index 79d2d5b..a6f1ba0 100644
--- a/java/org/apache/catalina/tribes/group/RpcChannel.java
+++ b/java/org/apache/catalina/tribes/group/RpcChannel.java
@@ -178,7 +178,7 @@ public class RpcChannel implements ChannelListener {
}
@Override
-public void finalize() throws Throwable {
+protected void finalize() throws Throwable {
breakdown();
super.finalize();
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
buildbot failure in on tomcat-trunk
The Buildbot has detected a new failure on builder tomcat-trunk while building tomcat. Full details are available at: https://ci.apache.org/builders/tomcat-trunk/builds/4082 Buildbot URL: https://ci.apache.org/ Buildslave for this Build: silvanus_ubuntu Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-commit' triggered this build Build Source Stamp: [branch master] 245d5de49f3f9fb9c89d49da43b3f400f19a6934 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
[tomcat] branch master updated: SpotBugs: finalize() should be protected
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 245d5de SpotBugs: finalize() should be protected
245d5de is described below
commit 245d5de49f3f9fb9c89d49da43b3f400f19a6934
Author: Mark Thomas
AuthorDate: Tue Feb 26 21:12:33 2019 +
SpotBugs: finalize() should be protected
Fix a minor SpotBugs issue to trigger a CI build as part of testing the
svn -> git migration
---
java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
index d45bb28..f2c799c 100644
--- a/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
+++ b/java/org/apache/catalina/tribes/tipis/AbstractReplicatedMap.java
@@ -385,7 +385,7 @@ public abstract class AbstractReplicatedMap
}
@Override
-public void finalize() throws Throwable {
+protected void finalize() throws Throwable {
try {
breakdown();
} finally {
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
On Tue, Feb 26, 2019 at 11:28 AM Mark Thomas wrote: > On 26/02/2019 18:23, Igal Sapir wrote: > > Mark, > > > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > > > >> All, > >> > >> https://github.com/apache/tomcat > >> > >> is now ready for testing. > >> > >> It should contain: > >> branches > >> - master (9.0.x) > >> - 8.5.x > >> - 7.0.x > >> > > > > What are the plans for the tomcat-site? > > Migrate to git-pub-sub from svn-pub-sub at some point. Timing TBD. > > > I am working on the new site > > design and will soon be ready to push the changes. > > > > I will first upload a full working version to a temporary location for > > review. > > Cool. > > > How will the site's source directory be wired to tomcat.apache.org? Do > we > > need to request INFRA to set it up? > > We'll need a branch called asf-site and that needs to contain the site's > content which should consist entirely of static files. How we generate > the content of that branch from (presumably) master is up to us. > > We can set this git repo up whenever we want. We can do it now if it > makes it easier for you. > No rush on my end since I can always push the changes to a repo on my own GitHub account and we can later merge it. I thought that it might be easier for you since you're already working on that and I wanted to make sure that we don't "forget" it, so whenever it works for you is fine by me. Thanks, Igal
Re: Git migration read for testing
On 26/02/2019 18:23, Igal Sapir wrote: > Mark, > > On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > >> All, >> >> https://github.com/apache/tomcat >> >> is now ready for testing. >> >> It should contain: >> branches >> - master (9.0.x) >> - 8.5.x >> - 7.0.x >> > > What are the plans for the tomcat-site? Migrate to git-pub-sub from svn-pub-sub at some point. Timing TBD. > I am working on the new site > design and will soon be ready to push the changes. > > I will first upload a full working version to a temporary location for > review. Cool. > How will the site's source directory be wired to tomcat.apache.org? Do we > need to request INFRA to set it up? We'll need a branch called asf-site and that needs to contain the site's content which should consist entirely of static files. How we generate the content of that branch from (presumably) master is up to us. We can set this git repo up whenever we want. We can do it now if it makes it easier for you. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: svn commit: r1854413 [1/6] - in /tomcat/site/trunk: ./ docs/ xdocs/ xdocs/stylesheets/
On 26/02/2019 19:16, ma...@apache.org wrote: > Author: markt > Date: Tue Feb 26 19:16:17 2019 > New Revision: 1854413 > > URL: http://svn.apache.org/viewvc?rev=1854413=rev > Log: > First pass to update site after migrating Tomcat 9.0.x, 8.5.x and 7.0.x to Git This was a very rough first pass. I'm going to move on to the CI systems. I'll try and come back to the site but if someone spots something that needs fixing / could stand some improvement please just fix it. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
svn commit: r1854413 [4/6] - in /tomcat/site/trunk: ./ docs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/oldnews.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/oldnews.html?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/oldnews.html (original) +++ tomcat/site/trunk/docs/oldnews.html Tue Feb 26 19:16:17 2019 @@ -1,1570 +1,1551 @@ - - - - - -Apache Tomcat - Old news! - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - - -
svn commit: r1854413 [6/6] - in /tomcat/site/trunk: ./ docs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/whichversion.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/whichversion.html?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/whichversion.html (original) +++ tomcat/site/trunk/docs/whichversion.html Tue Feb 26 19:16:17 2019 @@ -1,227 +1,227 @@ - - - - - -Apache Tomcat - Which Version Do I Want? - - - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - -
svn commit: r1854413 [2/6] - in /tomcat/site/trunk: ./ docs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-7.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-7.html?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/migration-7.html (original) +++ tomcat/site/trunk/docs/migration-7.html Tue Feb 26 19:16:17 2019 @@ -1,698 +1,680 @@ - - - - - -Apache Tomcat - Migration Guide - Tomcat 7.0.x - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1854413 [5/6] - in /tomcat/site/trunk: ./ docs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/security.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security.html?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/security.html (original) +++ tomcat/site/trunk/docs/security.html Tue Feb 26 19:16:17 2019 @@ -1,379 +1,378 @@ - - - - - -Apache Tomcat - Reporting Security Problems - - - - - - - - - -http://tomcat.apache.org/;> - -Apache Tomcat - - -https://www.apache.org/foundation/contributing.html; target="_blank" class="pull-left">https://www.apache.org/images/SupportApache-small.png; class="support-asf" alt="Support Apache">http://www.apache.org/; target="_blank" class="pull-left"> - - - - - - - -https://www.google.com/search; method="get"> - -GO - - - - -Apache Tomcat - - -Home - - -Taglibs - - -Maven Plugin - - - - -Download - - -Which version? - - -https://tomcat.apache.org/download-90.cgi;>Tomcat 9 - - -https://tomcat.apache.org/download-80.cgi;>Tomcat 8 - - -https://tomcat.apache.org/download-70.cgi;>Tomcat 7 - - -https://tomcat.apache.org/download-connectors.cgi;>Tomcat Connectors - - -https://tomcat.apache.org/download-native.cgi;>Tomcat Native - - -https://tomcat.apache.org/download-taglibs.cgi;>Taglibs - - -https://archive.apache.org/dist/tomcat/;>Archives - - - - -Documentation - - -Tomcat 9.0 - - -Tomcat 8.5 - - -Tomcat 7.0 - - -Tomcat Connectors - - -Tomcat Native - - -https://wiki.apache.org/tomcat/FrontPage;>Wiki - - -Migration Guide - - -Presentations - - -
svn commit: r1854413 [3/6] - in /tomcat/site/trunk: ./ docs/ xdocs/ xdocs/stylesheets/
Modified: tomcat/site/trunk/docs/migration-85.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-85.html?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/migration-85.html (original) +++ tomcat/site/trunk/docs/migration-85.html Tue Feb 26 19:16:17 2019 @@ -135,7 +135,7 @@ Overview -Source code +Source code Buildbot @@ -662,59 +662,20 @@ of Apache Tomcat. The differences will be shown in a new tab/window. - -"use strict"; // Enable strict mode ++Note: If there are no differences you will see an error page.
-document.addEventListener("DOMContentLoaded", function() { -var formSubmit = document.getElementById("tc8Submit"); - formSubmit.addEventListener("submit", function() { -var revisions = { - "HEAD":"HEAD", - "8.5.0":"1735438", - "8.5.2":"1743439", - "8.5.3":"1747521", - "8.5.4":"1751624", - "8.5.5":"1758670", - "8.5.6":"1763654", - "8.5.8":"1767971", - "8.5.9":"1772784", - "8.5.11":"1778198", - "8.5.12":"1786041", - "8.5.13":"1788935", - "8.5.14":"1791243", - "8.5.15":"1794013", - "8.5.16":"1799487", - "8.5.20":"1803930", - "8.5.21":"1808282", - "8.5.23":"1809969", - "8.5.24":"1816448", - "8.5.27":"1821550", - "8.5.28":"1823407", - "8.5.29":"1825889", - "8.5.30":"1828275", - "8.5.31":"1830392", - "8.5.32":"1833943", - "8.5.33":"1837884", - "8.5.34":"1840071", - "8.5.35":"1845673", - "8.5.37":"1848752", - "8.5.38":"1852987" -}; - -formSubmit.action = "http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/"; + - document.getElementById('select-filename').value; -formSubmit.elements['r1'].value = revisions[document.getElementById('select-r1').value]; -formSubmit.elements['r2'].value = revisions[document.getElementById('select-r2').value]; -return true; - }, false); -}, false); - + +https://gitbox.apache.org/repos/asf; method="get" target="_blank"> + + + Configuration file: - + catalina.policy catalina.properties context.xml @@ -728,7 +689,7 @@ of Apache Tomcat. Old version: - + 8.5.0 8.5.2 8.5.3 @@ -759,7 +720,7 @@ of Apache Tomcat. 8.5.37 8.5.38 , new version: - + 8.5.0 8.5.2 8.5.3 @@ -795,25 +756,20 @@ of Apache Tomcat. - - - - -View Differences +View Differences -You can also use Subversion command similar to the following (all on one line): +You can also use a Git command similar to the following from within a + working copy: -svn diff - --old=http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_0/conf/ - --new=http://svn.apache.org/repos/asf/tomcat/tc8.5.x/tags/TOMCAT_8_5_2/conf/ +git diff 8.5.0 8.5.20 -- conf/ Modified: tomcat/site/trunk/docs/migration-9.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/migration-9.html?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/migration-9.html (original) +++ tomcat/site/trunk/docs/migration-9.html Tue Feb 26 19:16:17 2019 @@ -135,7 +135,7 @@ Overview -Source code +Source code Buildbot @@ -805,60 +805,20 @@ of Apache Tomcat. The differences will be shown in a new tab/window. - -"use strict"; // Enable strict mode ++Note: If there are no differences you will see an error page.
-document.addEventListener("DOMContentLoaded", function() { -var formSubmit = document.getElementById("tc9Submit"); - formSubmit.addEventListener("submit", function() { -var revisions = { - "HEAD":"HEAD", - "9.0.0.M1":"1714130", - "9.0.0.M3":"1728005", - "9.0.0.M4":"1734692", - "9.0.0.M6":"1743436", - "9.0.0.M8":"1747242", - "9.0.0.M9":"1751366", - "9.0.0.M10":"1758617", - "9.0.0.M11":"1763638", - "9.0.0.M13":"1767969", - "9.0.0.M15":"1772668", - "9.0.0.M17":"1778197", - "9.0.0.M18":"1785983", - "9.0.0.M19":"1788896", - "9.0.0.M20":"1791176", - "9.0.0.M21":"1793917", - "9.0.0.M22":"1799415", - "9.0.0.M26":"1803915", - "9.0.1":"1809848", - "9.0.2":"1816351", - "9.0.4":"1821547", - "9.0.5":"1823394", - "9.0.6":"1825860", - "9.0.7":"1828274", - "9.0.8":"1830389", - "9.0.10":"1833930", -
svn commit: r1854413 [1/6] - in /tomcat/site/trunk: ./ docs/ xdocs/ xdocs/stylesheets/
Author: markt Date: Tue Feb 26 19:16:17 2019 New Revision: 1854413 URL: http://svn.apache.org/viewvc?rev=1854413=rev Log: First pass to update site after migrating Tomcat 9.0.x, 8.5.x and 7.0.x to Git Added: tomcat/site/trunk/docs/.htaccess (with props) tomcat/site/trunk/docs/source.html (with props) tomcat/site/trunk/xdocs/.htaccess (with props) tomcat/site/trunk/xdocs/source.xml (with props) Removed: tomcat/site/trunk/xdocs/svn.xml Modified: tomcat/site/trunk/build.xml tomcat/site/trunk/docs/bugreport.html tomcat/site/trunk/docs/doap_Tomcat.rdf tomcat/site/trunk/docs/index.html tomcat/site/trunk/docs/migration-7.html tomcat/site/trunk/docs/migration-85.html tomcat/site/trunk/docs/migration-9.html tomcat/site/trunk/docs/oldnews.html tomcat/site/trunk/docs/security.html tomcat/site/trunk/docs/sitemap-main.xml tomcat/site/trunk/docs/whichversion.html tomcat/site/trunk/xdocs/bugreport.xml tomcat/site/trunk/xdocs/doap_Tomcat.rdf tomcat/site/trunk/xdocs/migration-7.xml tomcat/site/trunk/xdocs/migration-85.xml tomcat/site/trunk/xdocs/migration-9.xml tomcat/site/trunk/xdocs/security.xml tomcat/site/trunk/xdocs/sitemap-main.xml tomcat/site/trunk/xdocs/stylesheets/project.xml Modified: tomcat/site/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/site/trunk/build.xml?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/build.xml (original) +++ tomcat/site/trunk/build.xml Tue Feb 26 19:16:17 2019 @@ -45,6 +45,7 @@ + Added: tomcat/site/trunk/docs/.htaccess URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/.htaccess?rev=1854413=auto == --- tomcat/site/trunk/docs/.htaccess (added) +++ tomcat/site/trunk/docs/.htaccess Tue Feb 26 19:16:17 2019 @@ -0,0 +1,2 @@ +RewriteEngine On +RewriteRule ^/svn.html /source.html [R=301] \ No newline at end of file Propchange: tomcat/site/trunk/docs/.htaccess -- svn:eol-style = native Modified: tomcat/site/trunk/docs/bugreport.html URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/bugreport.html?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/bugreport.html (original) +++ tomcat/site/trunk/docs/bugreport.html Tue Feb 26 19:16:17 2019 @@ -135,7 +135,7 @@ Overview -Source code +Source code Buildbot @@ -579,7 +579,7 @@ problem you are having before reporting https://tomcat.apache.org/tomcat-9.0-doc/changelog.html;>changelog.html -https://svn.apache.org/repos/asf/tomcat/trunk/webapps/docs/changelog.xml;>changelog.xml +https://ci.apache.org/projects/tomcat/tomcat9/docs/changelog.html;>changelog.html - CI @@ -592,7 +592,7 @@ problem you are having before reporting https://tomcat.apache.org/tomcat-8.5-doc/changelog.html;>changelog.html -https://svn.apache.org/repos/asf/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml;>changelog.xml +https://ci.apache.org/projects/tomcat/tomcat85/docs/changelog.html;>changelog.html - CI @@ -605,7 +605,7 @@ problem you are having before reporting https://tomcat.apache.org/tomcat-7.0-doc/changelog.html;>changelog.html -https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml;>changelog.xml +https://ci.apache.org/projects/tomcat/tomcat7/docs/changelog.html;>changelog.html - CI @@ -882,7 +882,9 @@ bug in your web application. -To propose a patch, attach it to a Bugzilla issue. +For components available via GitHub you may provide a proposed patch as a +pull request. Alternatively, you can attach your proposed patch to a +Bugzilla issue. When providing a patch, please mention to which version of the source code it applies. Any patches are welcome, but we prefer the ones that use the http://en.wikipedia.org/wiki/Diff#Unified_format; rel="nofollow"> @@ -897,7 +899,7 @@ bug in your web application. -Subversion repository structure of Apache Tomcat +Repository access for Apache Tomcat Read BUILDING.txt in the source distribution Modified: tomcat/site/trunk/docs/doap_Tomcat.rdf URL: http://svn.apache.org/viewvc/tomcat/site/trunk/docs/doap_Tomcat.rdf?rev=1854413=1854412=1854413=diff == --- tomcat/site/trunk/docs/doap_Tomcat.rdf (original) +++ tomcat/site/trunk/docs/doap_Tomcat.rdf Tue Feb 26 19:16:17 2019 @@ -86,10 +86,11 @@ - -http://svn.apache.org/repos/asf/tomcat"/> -
Re: Git migration read for testing
Mark, On Tue, Feb 26, 2019 at 4:33 AM Mark Thomas wrote: > All, > > https://github.com/apache/tomcat > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > - 7.0.x > What are the plans for the tomcat-site? I am working on the new site design and will soon be ready to push the changes. I will first upload a full working version to a temporary location for review. How will the site's source directory be wired to tomcat.apache.org? Do we need to request INFRA to set it up? Best, Igal
Re: Git migration read for testing
On Tue, Feb 26, 2019 at 6:45 AM Mark Thomas wrote: > On 26/02/2019 13:54, Rémy Maucherat wrote: > > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > > > >> All, > >> > >> https://github.com/apache/tomcat > >> > >> is now ready for testing. > >> > > > > That looks quite good :) > +1. Looks good to me. > > > > Should we plan to all work with PRs for large changes ? > > That sounds like a better way of doing what we have done in the past > with large proposed patches. > +1 > > I've just discovered that the Eclipse IDE does not support Git > worktrees. I'm not sure how much of a nuisance that is going to turn out > to be. IntelliJ IDEA does support worktrees and JetBrains offer open > source licenses so I've applied for one. I'm not sure the benefit of > worktree support is going to be worth the pain of switching IDEs. I > guess I'll find out... > I find IntelliJ to be much superior to Eclipse. JetBrains does offer license which is very generous of them, but I find that for Java (IDEA, as opposed to some of their other products) even the free, community edition, is more than sufficient and possibly also lighter than the Ultimate edition. Igal
[tomcat] branch 8.5.x updated: Add a Java keystore containing an EC cert for tetsing
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 86772d9 Add a Java keystore containing an EC cert for tetsing 86772d9 is described below commit 86772d968ec576b4d5f9cbe3ec785b9331bfd4b4 Author: Mark Thomas AuthorDate: Tue Feb 26 16:29:13 2019 + Add a Java keystore containing an EC cert for tetsing --- test/org/apache/tomcat/util/net/localhost-ec.jks | Bin 0 -> 3089 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/org/apache/tomcat/util/net/localhost-ec.jks b/test/org/apache/tomcat/util/net/localhost-ec.jks new file mode 100644 index 000..a6572af Binary files /dev/null and b/test/org/apache/tomcat/util/net/localhost-ec.jks differ - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
On 26/02/2019 16:20, Mark Thomas wrote: > On 26/02/2019 15:25, Huxing Zhang wrote: >> Hi, >> >> It looks good to me. >> >> I think it is better to add some description and tags in the headline >> of Github, to make it more informative and searchable. >> >> For example: Apache Tomcat® is an open source implementation of the >> Java Servlet, JavaServer Pages, Java Expression Language and Java >> WebSocket technologies. >> >> Also I think the CONTRIBUTING file need to be update, to deprecate the >> usage of svn. >> >> Further search using SVN as keyword in the repo shows more work need >> to be updated. > > Indeed. There are a whole bunch of things that will need to be updated > assuming we decide we are happy with the new repos. > > So far all looks good. I'm just trying to work through with infra why we > saw 2 commit emails. Appears to be a one-off glitch. I'm going to tell infra all is well and they can remove the tomcat85 and tomcat70 mirrors from github. The git repo is now officially read/write and can be used via either of: https://gitbox.apache.org/repos/asf/tomcat.git https://github.com/apache/tomcat I'm going to start updating docs, CI systems etc. As part of those updates, I'll move the svn repos to tomcat/archive Mark > > Mark > > >> >> [1] https://github.com/apache/tomcat/blob/master/CONTRIBUTING.md >> >> On Tue, Feb 26, 2019 at 8:33 PM Mark Thomas wrote: >>> >>> All, >>> >>> https://github.com/apache/tomcat >>> >>> is now ready for testing. >>> >>> It should contain: >>> branches >>> - master (9.0.x) >>> - 8.5.x >>> - 7.0.x >>> >>> Tags: >>> - one for each 7.0.x, 8.5.x and 9.0.x release >>> >>> Tags have all been renamed to follow a a.b.c-MODIFIERn format for >>> version number where modifier is RC or M. >>> >>> The repository is probably read/write for all committers now but please >>> refrain from making any changes until we confirm that all is well. >>> >>> If you have some time available now, please test this new repository and >>> report and questions or concerns to this thread. >>> >>> Assuming no issues are discovered, I'd like to formally move over to git >>> later today. >>> >>> Mark >>> >>> - >>> 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 > - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Add a Java keystore containing an EC cert for tetsing
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 f9f8d28 Add a Java keystore containing an EC cert for tetsing f9f8d28 is described below commit f9f8d2869143bd2c3fa203bd3340c53d7735921a Author: Mark Thomas AuthorDate: Tue Feb 26 16:29:13 2019 + Add a Java keystore containing an EC cert for tetsing --- test/org/apache/tomcat/util/net/localhost-ec.jks | Bin 0 -> 3089 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/test/org/apache/tomcat/util/net/localhost-ec.jks b/test/org/apache/tomcat/util/net/localhost-ec.jks new file mode 100644 index 000..a6572af Binary files /dev/null and b/test/org/apache/tomcat/util/net/localhost-ec.jks differ - 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: Refactor: Make classes static and StoreType package protected
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 94a31cc Refactor: Make classes static and StoreType package protected
94a31cc is described below
commit 94a31cc08f4674d7203fd5425bc08398d8c066fe
Author: Mark Thomas
AuthorDate: Tue Feb 26 15:01:36 2019 +
Refactor: Make classes static and StoreType package protected
---
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 24018bc..5dd6401 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -256,7 +256,7 @@ public class SSLHostConfigCertificate implements
Serializable {
// Nested types
-public enum Type {
+public static enum Type {
UNDEFINED,
RSA(Authentication.RSA),
@@ -279,7 +279,7 @@ public class SSLHostConfigCertificate implements
Serializable {
}
}
-private enum StoreType {
+static enum StoreType {
KEYSTORE,
PEM
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
Am 2019-02-26 um 13:33 schrieb Mark Thomas: All, https://github.com/apache/tomcat is now ready for testing. It should contain: branches - master (9.0.x) - 8.5.x - 7.0.x Tags: - one for each 7.0.x, 8.5.x and 9.0.x release Tags have all been renamed to follow a a.b.c-MODIFIERn format for version number where modifier is RC or M. That looks so sweet and tidy. I cannot clone the repo at the moment, Gitbox seems to be down in EU. Thank you for your effort! Michael - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
On 26/02/2019 15:25, Huxing Zhang wrote: > Hi, > > It looks good to me. > > I think it is better to add some description and tags in the headline > of Github, to make it more informative and searchable. > > For example: Apache Tomcat® is an open source implementation of the > Java Servlet, JavaServer Pages, Java Expression Language and Java > WebSocket technologies. > > Also I think the CONTRIBUTING file need to be update, to deprecate the > usage of svn. > > Further search using SVN as keyword in the repo shows more work need > to be updated. Indeed. There are a whole bunch of things that will need to be updated assuming we decide we are happy with the new repos. So far all looks good. I'm just trying to work through with infra why we saw 2 commit emails. Mark > > [1] https://github.com/apache/tomcat/blob/master/CONTRIBUTING.md > > On Tue, Feb 26, 2019 at 8:33 PM Mark Thomas wrote: >> >> All, >> >> https://github.com/apache/tomcat >> >> is now ready for testing. >> >> It should contain: >> branches >> - master (9.0.x) >> - 8.5.x >> - 7.0.x >> >> Tags: >> - one for each 7.0.x, 8.5.x and 9.0.x release >> >> Tags have all been renamed to follow a a.b.c-MODIFIERn format for >> version number where modifier is RC or M. >> >> The repository is probably read/write for all committers now but please >> refrain from making any changes until we confirm that all is well. >> >> If you have some time available now, please test this new repository and >> report and questions or concerns to this thread. >> >> Assuming no issues are discovered, I'd like to formally move over to git >> later today. >> >> Mark >> >> - >> 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
Re: Git migration read for testing
Am 2019-02-26 um 14:54 schrieb Rémy Maucherat: On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: All, https://github.com/apache/tomcat is now ready for testing. It should contain: branches - master (9.0.x) - 8.5.x - 7.0.x Tags: - one for each 7.0.x, 8.5.x and 9.0.x release Tags have all been renamed to follow a a.b.c-MODIFIERn format for version number where modifier is RC or M. The repository is probably read/write for all committers now but please refrain from making any changes until we confirm that all is well. If you have some time available now, please test this new repository and report and questions or concerns to this thread. Assuming no issues are discovered, I'd like to formally move over to git later today. That looks quite good :) Should we plan to all work with PRs for large changes ? I'd love to have this, giving some time for the community to watch over the change...and assigning reviewers to it. - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
Hi, It looks good to me. I think it is better to add some description and tags in the headline of Github, to make it more informative and searchable. For example: Apache Tomcat® is an open source implementation of the Java Servlet, JavaServer Pages, Java Expression Language and Java WebSocket technologies. Also I think the CONTRIBUTING file need to be update, to deprecate the usage of svn. Further search using SVN as keyword in the repo shows more work need to be updated. [1] https://github.com/apache/tomcat/blob/master/CONTRIBUTING.md On Tue, Feb 26, 2019 at 8:33 PM Mark Thomas wrote: > > All, > > https://github.com/apache/tomcat > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > - 7.0.x > > Tags: > - one for each 7.0.x, 8.5.x and 9.0.x release > > Tags have all been renamed to follow a a.b.c-MODIFIERn format for > version number where modifier is RC or M. > > The repository is probably read/write for all committers now but please > refrain from making any changes until we confirm that all is well. > > If you have some time available now, please test this new repository and > report and questions or concerns to this thread. > > Assuming no issues are discovered, I'd like to formally move over to git > later today. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > -- Best Regards！ Huxing - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Refactor: Make classes static and StoreType package protected
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 97349ed Refactor: Make classes static and StoreType package protected
97349ed is described below
commit 97349ed72443618eee564cb113f18fbc0ee60749
Author: Mark Thomas
AuthorDate: Tue Feb 26 15:01:36 2019 +
Refactor: Make classes static and StoreType package protected
---
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 24018bc..5dd6401 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -256,7 +256,7 @@ public class SSLHostConfigCertificate implements
Serializable {
// Nested types
-public enum Type {
+public static enum Type {
UNDEFINED,
RSA(Authentication.RSA),
@@ -279,7 +279,7 @@ public class SSLHostConfigCertificate implements
Serializable {
}
}
-private enum StoreType {
+static enum StoreType {
KEYSTORE,
PEM
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
[tomcat] branch master updated: Refactor: Make classes static and StoreType package protected
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 97349ed Refactor: Make classes static and StoreType package protected
97349ed is described below
commit 97349ed72443618eee564cb113f18fbc0ee60749
Author: Mark Thomas
AuthorDate: Tue Feb 26 15:01:36 2019 +
Refactor: Make classes static and StoreType package protected
---
java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
index 24018bc..5dd6401 100644
--- a/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
+++ b/java/org/apache/tomcat/util/net/SSLHostConfigCertificate.java
@@ -256,7 +256,7 @@ public class SSLHostConfigCertificate implements
Serializable {
// Nested types
-public enum Type {
+public static enum Type {
UNDEFINED,
RSA(Authentication.RSA),
@@ -279,7 +279,7 @@ public class SSLHostConfigCertificate implements
Serializable {
}
}
-private enum StoreType {
+static enum StoreType {
KEYSTORE,
PEM
}
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
On 26/02/2019 13:54, Rémy Maucherat wrote: > On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > >> All, >> >> https://github.com/apache/tomcat >> >> is now ready for testing. >> >> It should contain: >> branches >> - master (9.0.x) >> - 8.5.x >> - 7.0.x >> >> Tags: >> - one for each 7.0.x, 8.5.x and 9.0.x release >> >> Tags have all been renamed to follow a a.b.c-MODIFIERn format for >> version number where modifier is RC or M. >> >> The repository is probably read/write for all committers now but please >> refrain from making any changes until we confirm that all is well. >> >> If you have some time available now, please test this new repository and >> report and questions or concerns to this thread. >> >> Assuming no issues are discovered, I'd like to formally move over to git >> later today. >> > > That looks quite good :) > > Should we plan to all work with PRs for large changes ? That sounds like a better way of doing what we have done in the past with large proposed patches. I've just discovered that the Eclipse IDE does not support Git worktrees. I'm not sure how much of a nuisance that is going to turn out to be. IntelliJ IDEA does support worktrees and JetBrains offer open source licenses so I've applied for one. I'm not sure the benefit of worktree support is going to be worth the pain of switching IDEs. I guess I'll find out... I've done a diff and current git and svn HEAD agree. I've also done some random checks of tags etc and all looks OK. Next up I want to do a test commit. All, please don't commit to the repo just yet - even if you see me making commits. Thanks, Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
On Tue, Feb 26, 2019 at 1:33 PM Mark Thomas wrote: > All, > > https://github.com/apache/tomcat > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > - 7.0.x > > Tags: > - one for each 7.0.x, 8.5.x and 9.0.x release > > Tags have all been renamed to follow a a.b.c-MODIFIERn format for > version number where modifier is RC or M. > > The repository is probably read/write for all committers now but please > refrain from making any changes until we confirm that all is well. > > If you have some time available now, please test this new repository and > report and questions or concerns to this thread. > > Assuming no issues are discovered, I'd like to formally move over to git > later today. > That looks quite good :) Should we plan to all work with PRs for large changes ? Rémy
Re: Git migration read for testing
On 26/02/2019 13:10, Mark Thomas wrote: > On 26/02/2019 12:45, Martin Grigorov wrote: >> All seems to work. >> I haven't received any email notifications though. > > I'll check where notifications are being sent. That should be fixed now. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
On 26/02/2019 12:45, Martin Grigorov wrote: > Hi, > > On Tue, Feb 26, 2019 at 2:33 PM Mark Thomas wrote: > >> All, >> >> https://github.com/apache/tomcat >> >> is now ready for testing. >> >> It should contain: >> branches >> - master (9.0.x) >> - 8.5.x >> - 7.0.x >> >> Tags: >> - one for each 7.0.x, 8.5.x and 9.0.x release >> >> Tags have all been renamed to follow a a.b.c-MODIFIERn format for >> version number where modifier is RC or M. >> >> The repository is probably read/write for all committers now but please >> refrain from making any changes until we confirm that all is well. >> >> If you have some time available now, please test this new repository and >> report and questions or concerns to this thread. >> > > I've just created a new branch, committed an empty change and removed the > branch. > All seems to work. > I haven't received any email notifications though. I'll check where notifications are being sent. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
Re: Git migration read for testing
Hi, On Tue, Feb 26, 2019 at 2:33 PM Mark Thomas wrote: > All, > > https://github.com/apache/tomcat > > is now ready for testing. > > It should contain: > branches > - master (9.0.x) > - 8.5.x > - 7.0.x > > Tags: > - one for each 7.0.x, 8.5.x and 9.0.x release > > Tags have all been renamed to follow a a.b.c-MODIFIERn format for > version number where modifier is RC or M. > > The repository is probably read/write for all committers now but please > refrain from making any changes until we confirm that all is well. > > If you have some time available now, please test this new repository and > report and questions or concerns to this thread. > I've just created a new branch, committed an empty change and removed the branch. All seems to work. I haven't received any email notifications though. Martin > > Assuming no issues are discovered, I'd like to formally move over to git > later today. > > Mark > > - > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org > For additional commands, e-mail: dev-h...@tomcat.apache.org > >
Git migration read for testing
All, https://github.com/apache/tomcat is now ready for testing. It should contain: branches - master (9.0.x) - 8.5.x - 7.0.x Tags: - one for each 7.0.x, 8.5.x and 9.0.x release Tags have all been renamed to follow a a.b.c-MODIFIERn format for version number where modifier is RC or M. The repository is probably read/write for all committers now but please refrain from making any changes until we confirm that all is well. If you have some time available now, please test this new repository and report and questions or concerns to this thread. Assuming no issues are discovered, I'd like to formally move over to git later today. Mark - To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
