[GitHub] [tomcat] rotty3000 opened a new pull request #308: Fix BZ 64544 - add built libs to the bnd classpath for introspection

[GitBox]

rotty3000 opened a new pull request #308:
URL: https://github.com/apache/tomcat/pull/308


   Signed-off-by: Raymond Augé 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

buildbot failure in on tomcat-9-trunk

[buildbot]

The Buildbot has detected a new failure on builder tomcat-9-trunk while 
building tomcat. Full details are available at:
https://ci.apache.org/builders/tomcat-9-trunk/builds/303

Buildbot URL: https://ci.apache.org/

Buildslave for this Build: asf946_ubuntu

Build Reason: The AnyBranchScheduler scheduler named 'on-tomcat-9-commit' 
triggered this build
Build Source Stamp: [branch 9.0.x] 5f49acfddf430b8e6be8ce35e12a121368d24f08
Blamelist: remm 

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 9.0.x updated: Fix changelog error

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 5f49acf  Fix changelog error
5f49acf is described below

commit 5f49acfddf430b8e6be8ce35e12a121368d24f08
Author: remm 
AuthorDate: Tue Jun 23 23:49:51 2020 +0200

Fix changelog error
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 43a2485..1e581c8 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -71,11 +71,11 @@
 response is returned for an HTTP/2 request if the mapped servlet does
 implement the requested method rather than the more general
 400 response. (markt)
+  
   
 Add generated classes using Tomcat embedded as an optional replacement
 for the Catalina configuration files. (remm)
   
-  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Fix changelog error

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 0bab3b2  Fix changelog error
0bab3b2 is described below

commit 0bab3b264ce43078199aff6e4f281db2091c5eed
Author: remm 
AuthorDate: Tue Jun 23 23:49:51 2020 +0200

Fix changelog error
---
 webapps/docs/changelog.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index ed6ee45..a7d0320 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -74,11 +74,11 @@
 response is returned for an HTTP/2 request if the mapped servlet does
 implement the requested method rather than the more general
 400 response. (markt)
+  
   
 Add generated classes using Tomcat embedded as an optional replacement
 for the Catalina configuration files. (remm)
   
-  
 
   
   


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

Oh thank goodness! I was worried!

Sincerely,
- Ray

On Tue, Jun 23, 2020 at 5:19 PM Filip Hanik  wrote:

>
> On 6/23/20 1:58 PM, Raymond Auge wrote:
>
> Further review of your error seems to indicate you are not using the
> specified version of bnd. Have you overridden this in your build.properties
> file?
>
> The regex in bnd 5.1.1 release is
> `((\(|\[)\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?,\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?(\]|\)))|\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?`
>
>
> Thank you Ray, that was it!
>
> Filip
>
>
>
> - Ray
>
> On Tue, Jun 23, 2020 at 4:05 PM Raymond Auge 
> wrote:
>
>>
>>
>>
>> On Tue, Jun 23, 2020 at 3:45 PM Filip Hanik  wrote:

> cd res/maven
>
 ant -f mvn-pub.xml generic-install
>


>> I also ran this in the HEAD 9.0.x branch before your change
>> (919183b438e1a2f0004082c69e34accc0c3e2f16) without error.
>>
>> - Ray
>>
>>
>>> I usually run

 ant clean deploy  embed

 Also I've added github actions build at least in my master fork that
 you can see is building on ubuntu and windows here
 https://github.com/rotty3000/tomcat/actions/runs/145316145

 I'll test the instructions you've given next.

 - ray


> Is that last command working for you?
>
> The error I'm getting is:
>
> package:
>   [jar] Building jar:
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
>
> add-osgi:
>  [echo] add-osgi
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
> true
>   [bnd] 1 ERRORS
>   [bnd]  Invalid value for Bundle-Version,
> ${version_cleanup;9.0.0-native-image-dev} does not match
> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>   [bnd]
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/res/bnd/annotations-api.jar.tmp.bnd:
> bnd failed
>   [bnd] at
> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>   [bnd] at
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>
> Filip
>
>
> - Ray
>
> On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik  wrote:
>
>>
>>
>>
>>
>> *From:* Raymond Auge 
>> *Sent:* Tuesday, June 23, 2020 12:17 PM
>> *To:* Tomcat Developers List 
>> *Subject:* Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling
>> error
>>
>>
>>
>> k, so travis config is borked.. I should add github actions.
>>
>>
>>
>> I don’t think Travis tests artifact generation
>>
>>
>>
>> - Ray
>>
>>
>>
>> On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge <
>> raymond.a...@liferay.com> wrote:
>>
>> 
>>
>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>
>

 --
 *Raymond Augé* 
  (@rotty3000)
 Senior Software Architect *Liferay, Inc.* 
  (@Liferay)

>>>
>>>
>>> --
>>> *Raymond Augé* 
>>>  (@rotty3000)
>>> Senior Software Architect *Liferay, Inc.* 
>>>  (@Liferay)
>>>
>>
>>
>> --
>> *Raymond Augé* 
>>  (@rotty3000)
>> Senior Software Architect *Liferay, Inc.* 
>>  (@Liferay)
>>
>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>
>

-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

[tomcat] branch master updated: Make `ant -f mvn-pub.xml generic-install` work with the new ant tasks

[fhanik]

This is an automated email from the ASF dual-hosted git repository.

fhanik 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 3717e06  Make `ant -f mvn-pub.xml generic-install` work with the new 
ant tasks
3717e06 is described below

commit 3717e06e5f2d58deb7379a20d43f688d89f716d4
Author: Filip Hanik 
AuthorDate: Tue Jun 23 11:11:24 2020 -0700

Make `ant -f mvn-pub.xml generic-install` work with the new ant tasks
---
 res/maven/mvn-pub.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index ae4e85d..0f5d6d2 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -50,8 +50,11 @@
   
 
 
-
+
+  
   
+  
+  
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Filip Hanik]

On 6/23/20 1:58 PM, Raymond Auge wrote:
Further review of your error seems to indicate you are not using the 
specified version of bnd. Have you overridden this in your 
build.properties file?


The regex in bnd 5.1.1 release is 
`((\(|\[)\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?,\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?(\]|\)))|\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?`



Thank you Ray, that was it!

Filip




- Ray

On Tue, Jun 23, 2020 at 4:05 PM Raymond Auge > wrote:





On Tue, Jun 23, 2020 at 3:45 PM Filip Hanik
mailto:fi...@hanik.com>> wrote:

cd res/maven

ant -f mvn-pub.xml generic-install



I also ran this in the HEAD 9.0.x branch before your change
(919183b438e1a2f0004082c69e34accc0c3e2f16) without error.

- Ray

I usually run

ant clean deploy  embed

Also I've added github actions build at least in my master
fork that you can see is building on ubuntu and windows
here
https://github.com/rotty3000/tomcat/actions/runs/145316145

I'll test the instructions you've given next.

- ray

Is that last command working for you?

The error I'm getting is:

package:
  [jar] Building jar:

/development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar

add-osgi:
 [echo] add-osgi

/development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
true
  [bnd] 1 ERRORS
  [bnd]  Invalid value for Bundle-Version,
${version_cleanup;9.0.0-native-image-dev} does not
match
[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
  [bnd]

/development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/res/bnd/annotations-api.jar.tmp.bnd:
bnd failed
  [bnd] at

aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
  [bnd] at
aQute.bnd.ant.BndTask.execute(BndTask.java:119)
  [bnd] at

org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)

Filip



- Ray

On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik
mailto:fha...@vmware.com>> wrote:

*From:* Raymond Auge mailto:raymond.a...@liferay.com>>
*Sent:* Tuesday, June 23, 2020 12:17 PM
*To:* Tomcat Developers List
mailto:dev@tomcat.apache.org>>
*Subject:* Re: [tomcat] branch 9.0.x updated:
Fixes OSGI bundling error

k, so travis config is borked.. I should add
github actions.

*//*

I don’t think Travis tests artifact generation

- Ray

On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge
mailto:raymond.a...@liferay.com>> wrote:





-- 
*Raymond Augé*

 (@rotty3000)

Senior Software Architect *Liferay, Inc.*
 (@Liferay)




-- 
*Raymond Augé*

 (@rotty3000)

Senior Software Architect *Liferay, Inc.*
 (@Liferay)



-- 
*Raymond Augé*

 (@rotty3000)
Senior Software Architect *Liferay, Inc.*
 (@Liferay)



-- 
*Raymond Augé*

 (@rotty3000)
Senior Software Architect *Liferay, Inc.*
 (@Liferay)



--
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

[tomcat] branch 9.0.x updated: Revert "Fixes OSGI bundling error"

[fhanik]

This is an automated email from the ASF dual-hosted git repository.

fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 7ec1d31  Revert "Fixes OSGI bundling error"
7ec1d31 is described below

commit 7ec1d3158461c50123092a96c7ca8f032721a314
Author: Filip Hanik 
AuthorDate: Tue Jun 23 14:17:46 2020 -0700

Revert "Fixes OSGI bundling error"

This reverts commit caed3194b48ccbbac0572417b0e60807683a8690.
---
 res/bnd/build-defaults.bnd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index a099b49..cdefb9c 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-Bundle-Version: ${version}
+Bundle-Version: ${version_cleanup;${version}}
 
 Specification-Title: Apache Tomcat
 Specification-Version: ${version.major.minor}


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

Further review of your error seems to indicate you are not using the
specified version of bnd. Have you overridden this in your build.properties
file?

The regex in bnd 5.1.1 release is
`((\(|\[)\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?,\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?(\]|\)))|\d{1,9}(\.\d{1,9}(\.\d{1,9}(\.[-\w]+)?)?)?`

- Ray

On Tue, Jun 23, 2020 at 4:05 PM Raymond Auge 
wrote:

>
>
>
> On Tue, Jun 23, 2020 at 3:45 PM Filip Hanik  wrote:
>>>
 cd res/maven

>>> ant -f mvn-pub.xml generic-install

>>>
>>>
> I also ran this in the HEAD 9.0.x branch before your change
> (919183b438e1a2f0004082c69e34accc0c3e2f16) without error.
>
> - Ray
>
>
>> I usually run
>>>
>>> ant clean deploy  embed
>>>
>>> Also I've added github actions build at least in my master fork that you
>>> can see is building on ubuntu and windows here
>>> https://github.com/rotty3000/tomcat/actions/runs/145316145
>>>
>>> I'll test the instructions you've given next.
>>>
>>> - ray
>>>
>>>
 Is that last command working for you?

 The error I'm getting is:

 package:
   [jar] Building jar:
 /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar

 add-osgi:
  [echo] add-osgi
 /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
 true
   [bnd] 1 ERRORS
   [bnd]  Invalid value for Bundle-Version,
 ${version_cleanup;9.0.0-native-image-dev} does not match
 [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
   [bnd]
 /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/res/bnd/annotations-api.jar.tmp.bnd:
 bnd failed
   [bnd] at
 aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
   [bnd] at
 org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)

 Filip


 - Ray

 On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik  wrote:

>
>
>
>
> *From:* Raymond Auge 
> *Sent:* Tuesday, June 23, 2020 12:17 PM
> *To:* Tomcat Developers List 
> *Subject:* Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling
> error
>
>
>
> k, so travis config is borked.. I should add github actions.
>
>
>
> I don’t think Travis tests artifact generation
>
>
>
> - Ray
>
>
>
> On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge 
> wrote:
>
> 
>


 --
 *Raymond Augé* 
  (@rotty3000)
 Senior Software Architect *Liferay, Inc.* 
  (@Liferay)


>>>
>>> --
>>> *Raymond Augé* 
>>>  (@rotty3000)
>>> Senior Software Architect *Liferay, Inc.* 
>>>  (@Liferay)
>>>
>>
>>
>> --
>> *Raymond Augé* 
>>  (@rotty3000)
>> Senior Software Architect *Liferay, Inc.* 
>>  (@Liferay)
>>
>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>


-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

[CONF] Apache Tomcat > Servlet TCK 5.0

[Mark Thomas (Confluence)]

Title: Message Title



 
 
 
There's 1 new comment on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Servlet TCK 5.0 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Mark Thomas  
 
 
  
 
 

 
 
 
 
 
 
 
 
 Yep. One of my messier hacks. I'm not interested in trying to pass the default-context-path test. If ignoring the failure is not an option (and lets be honest when was the last time anyone even asked if Tomcat passed the TCK?) then my first choice would be to challenge the TCK test on the grounds the spec says containers may override it - and Tomcat does. Always. Don't get me wrong, having access to the TCK is useful - I'm just not particularly hung up on the certification process. If our users change their view on that then I will too. Until then...  
 
 
  
 
 
  
 
 

 
 
 
 
 
 
 
 
Reply
• 
 
 
 
 
 
 
Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View comment 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.5.0  
 
 
  
 
 
 
 
 
 
 
 
 

[GitHub] [tomcat] rotty3000 commented on pull request #307: github actions

[GitBox]

rotty3000 commented on pull request #307:
URL: https://github.com/apache/tomcat/pull/307#issuecomment-648393296


   Also we can add to the matrix as we go.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 commented on pull request #307: github actions

[GitBox]

rotty3000 commented on pull request #307:
URL: https://github.com/apache/tomcat/pull/307#issuecomment-648392839


   This could be applied to each of the key branches.



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] rotty3000 opened a new pull request #307: github actions

[GitBox]

rotty3000 opened a new pull request #307:
URL: https://github.com/apache/tomcat/pull/307


   Run github actions on branch pushes and PRs
   
   Signed-off-by: Raymond Augé 



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

On Tue, Jun 23, 2020 at 3:45 PM Filip Hanik  wrote:
>>
>>> cd res/maven
>>>
>> ant -f mvn-pub.xml generic-install
>>>
>>
>>
I also ran this in the HEAD 9.0.x branch before your change
(919183b438e1a2f0004082c69e34accc0c3e2f16) without error.

- Ray


> I usually run
>>
>> ant clean deploy  embed
>>
>> Also I've added github actions build at least in my master fork that you
>> can see is building on ubuntu and windows here
>> https://github.com/rotty3000/tomcat/actions/runs/145316145
>>
>> I'll test the instructions you've given next.
>>
>> - ray
>>
>>
>>> Is that last command working for you?
>>>
>>> The error I'm getting is:
>>>
>>> package:
>>>   [jar] Building jar:
>>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
>>>
>>> add-osgi:
>>>  [echo] add-osgi
>>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
>>> true
>>>   [bnd] 1 ERRORS
>>>   [bnd]  Invalid value for Bundle-Version,
>>> ${version_cleanup;9.0.0-native-image-dev} does not match
>>> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>>>   [bnd]
>>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/res/bnd/annotations-api.jar.tmp.bnd:
>>> bnd failed
>>>   [bnd] at
>>> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>>>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>>>   [bnd] at
>>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>>
>>> Filip
>>>
>>>
>>> - Ray
>>>
>>> On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik  wrote:
>>>




 *From:* Raymond Auge 
 *Sent:* Tuesday, June 23, 2020 12:17 PM
 *To:* Tomcat Developers List 
 *Subject:* Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error



 k, so travis config is borked.. I should add github actions.



 I don’t think Travis tests artifact generation



 - Ray



 On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge 
 wrote:

 

>>>
>>>
>>> --
>>> *Raymond Augé* 
>>>  (@rotty3000)
>>> Senior Software Architect *Liferay, Inc.* 
>>>  (@Liferay)
>>>
>>>
>>
>> --
>> *Raymond Augé* 
>>  (@rotty3000)
>> Senior Software Architect *Liferay, Inc.* 
>>  (@Liferay)
>>
>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>


-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

On Tue, Jun 23, 2020 at 3:57 PM Raymond Auge 
wrote:

>
>
> On Tue, Jun 23, 2020 at 3:45 PM Filip Hanik  wrote:
>
>>
>> On 6/23/20 12:38 PM, Raymond Auge wrote:
>>
>> `ant test` transitively invokes `deploy` target which builds the
>> artifacts.
>>
>> You'll want to run the following commands that are currently failing for
>> me
>>
>> ant clean
>> ant
>> ant test-compile
>> ant embed
>>
> FYI

ant (alone) is just ant deploy so to save yourself some time just invoke
all those in one go:

ant clean deploy test-compile embed

- Ray


>
>> cd res/maven
>> ant -f mvn-pub.xml generic-install
>>
>
> I usually run
>
> ant clean deploy  embed
>
> Also I've added github actions build at least in my master fork that you
> can see is building on ubuntu and windows here
> https://github.com/rotty3000/tomcat/actions/runs/145316145
>
> I'll test the instructions you've given next.
>
> - ray
>
>
>> Is that last command working for you?
>>
>> The error I'm getting is:
>>
>> package:
>>   [jar] Building jar:
>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
>>
>> add-osgi:
>>  [echo] add-osgi
>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
>> true
>>   [bnd] 1 ERRORS
>>   [bnd]  Invalid value for Bundle-Version,
>> ${version_cleanup;9.0.0-native-image-dev} does not match
>> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>>   [bnd]
>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/res/bnd/annotations-api.jar.tmp.bnd:
>> bnd failed
>>   [bnd] at
>> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>>   [bnd] at
>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>
>> Filip
>>
>>
>> - Ray
>>
>> On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik  wrote:
>>
>>>
>>>
>>>
>>>
>>> *From:* Raymond Auge 
>>> *Sent:* Tuesday, June 23, 2020 12:17 PM
>>> *To:* Tomcat Developers List 
>>> *Subject:* Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error
>>>
>>>
>>>
>>> k, so travis config is borked.. I should add github actions.
>>>
>>>
>>>
>>> I don’t think Travis tests artifact generation
>>>
>>>
>>>
>>> - Ray
>>>
>>>
>>>
>>> On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge 
>>> wrote:
>>>
>>> 
>>>
>>
>>
>> --
>> *Raymond Augé* 
>>  (@rotty3000)
>> Senior Software Architect *Liferay, Inc.* 
>>  (@Liferay)
>>
>>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>


-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

On Tue, Jun 23, 2020 at 3:45 PM Filip Hanik  wrote:

>
> On 6/23/20 12:38 PM, Raymond Auge wrote:
>
> `ant test` transitively invokes `deploy` target which builds the artifacts.
>
> You'll want to run the following commands that are currently failing for me
>
> ant clean
> ant
> ant test-compile
> ant embed
>
> cd res/maven
> ant -f mvn-pub.xml generic-install
>

I usually run

ant clean deploy embed

Also I've added github actions build at least in my master fork that you
can see is building on ubuntu and windows here
https://github.com/rotty3000/tomcat/actions/runs/145316145

I'll test the instructions you've given next.

- ray


> Is that last command working for you?
>
> The error I'm getting is:
>
> package:
>   [jar] Building jar:
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
>
> add-osgi:
>  [echo] add-osgi
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar
> true
>   [bnd] 1 ERRORS
>   [bnd]  Invalid value for Bundle-Version,
> ${version_cleanup;9.0.0-native-image-dev} does not match
> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>   [bnd]
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/res/bnd/annotations-api.jar.tmp.bnd:
> bnd failed
>   [bnd] at
> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>   [bnd] at
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>
> Filip
>
>
> - Ray
>
> On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik  wrote:
>
>>
>>
>>
>>
>> *From:* Raymond Auge 
>> *Sent:* Tuesday, June 23, 2020 12:17 PM
>> *To:* Tomcat Developers List 
>> *Subject:* Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error
>>
>>
>>
>> k, so travis config is borked.. I should add github actions.
>>
>>
>>
>> I don’t think Travis tests artifact generation
>>
>>
>>
>> - Ray
>>
>>
>>
>> On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge 
>> wrote:
>>
>> 
>>
>
>
> --
> *Raymond Augé* 
>  (@rotty3000)
> Senior Software Architect *Liferay, Inc.* 
>  (@Liferay)
>
>

-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Filip Hanik]

On 6/23/20 12:38 PM, Raymond Auge wrote:
`ant test` transitively invokes `deploy` target which builds the 
artifacts.


You'll want to run the following commands that are currently failing for me

ant clean
ant
ant test-compile
ant embed

cd res/maven
ant -f mvn-pub.xml generic-install

Is that last command working for you?

The error I'm getting is:

package:
  [jar] Building jar: 
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar


add-osgi:
 [echo] add-osgi 
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/output/build/lib/annotations-api.jar 
true

  [bnd] 1 ERRORS
  [bnd]  Invalid value for Bundle-Version, 
${version_cleanup;9.0.0-native-image-dev} does not match 
[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
  [bnd] 
/development/pivotal/cloudfoundry/spring-projects/graal/tomcat10/res/bnd/annotations-api.jar.tmp.bnd: 
bnd failed
  [bnd] at 
aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)

  [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
  [bnd] at 
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)


Filip



- Ray

On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik > wrote:


*From:* Raymond Auge mailto:raymond.a...@liferay.com>>
*Sent:* Tuesday, June 23, 2020 12:17 PM
*To:* Tomcat Developers List mailto:dev@tomcat.apache.org>>
*Subject:* Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling
error

k, so travis config is borked.. I should add github actions.

*//*

I don’t think Travis tests artifact generation

- Ray

On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge
mailto:raymond.a...@liferay.com>> wrote:





--
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

[CONF] Apache Tomcat > Servlet TCK 5.0

[Remy Maucherat (Confluence)]

Title: Message Title



 
 
 
There's 1 new comment on this page 
 
 
 
 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
Servlet TCK 5.0 
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 

 
 
 
 
Remy Maucherat  
 
 
  
 
 

 
 
 
 
 
 
 
 
  https://github.com/eclipse-ee4j/jakartaee-tck/pull/338/files#diff-89fad4e6a2e15e52564d819014661653  Ouch ...For default-context-path, I obviously hate this feature, whatever is done it will have to be a mess. First thing would be to add it to WebXml, the parser and the Context. Then figure out how workable it is to change the mapping.  
 
 
  
 
 
  
 
 

 
 
 
 
 
 
 
 
Reply
• 
 
 
 
 
 
 
Like 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
View comment 
 
 
  
 
 
  
 
 
  
 
 
  
 
 
 
 
 
 
 
 
 
 
Stop watching space
• 
 
 
 
 
 
 
Manage notifications 
 
 
 
 
 
 
 
 
 
 
  
 
 
This message was sent by Atlassian Confluence 7.5.0  
 
 
  
 
 
 
 
 
 
 
 
 

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

`ant test` transitively invokes `deploy` target which builds the artifacts.

- Ray

On Tue, Jun 23, 2020 at 3:21 PM Filip Hanik  wrote:

>
>
>
>
> *From:* Raymond Auge 
> *Sent:* Tuesday, June 23, 2020 12:17 PM
> *To:* Tomcat Developers List 
> *Subject:* Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error
>
>
>
> k, so travis config is borked.. I should add github actions.
>
>
>
> I don’t think Travis tests artifact generation
>
>
>
> - Ray
>
>
>
> On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge 
> wrote:
>
> 
>


-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

RE: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Filip Hanik]

From: Raymond Auge 
Sent: Tuesday, June 23, 2020 12:17 PM
To: Tomcat Developers List 
Subject: Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

k, so travis config is borked.. I should add github actions.

I don’t think Travis tests artifact generation

- Ray

On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge 
mailto:raymond.a...@liferay.com>> wrote:

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

k, so travis config is borked.. I should add github actions.

- Ray

On Tue, Jun 23, 2020 at 3:13 PM Raymond Auge 
wrote:

>
>
> On Tue, Jun 23, 2020 at 3:09 PM Raymond Auge 
> wrote:
>
>> Also, at the root of 9.0.x I hard coded the value of:
>>
>
> of course I meant HEAD (caed3194b48ccbbac0572417b0e60807683a8690)
>
> I'm not sure what you're missing. But it builds in CI does it not?
>
> - Ray
>
>
>>
>> Bundle-Version: ${version_cleanup;9.0.0-native-image-dev}
>>
>> and the result was no error and bundles have:
>>
>> Bundle-Version: 9.0.0.native-image-dev
>>
>> - Ray
>>
>> On Tue, Jun 23, 2020 at 3:02 PM Raymond Auge 
>> wrote:
>>
>>> See https://bz.apache.org/bugzilla/show_bug.cgi?id=64498
>>>
>>> On Tue, Jun 23, 2020 at 2:57 PM Raymond Auge 
>>> wrote:
>>>
 This is not a good fix. This is the same problem we had before with
 incompatible version syntax in OSGi.

 - Ray

 On Tue, Jun 23, 2020 at 2:54 PM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> fhanik pushed a commit to branch 9.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/9.0.x by this push:
>  new caed319  Fixes OSGI bundling error
> caed319 is described below
>
> commit caed3194b48ccbbac0572417b0e60807683a8690
> Author: Filip Hanik 
> AuthorDate: Tue Jun 23 11:53:08 2020 -0700
>
> Fixes OSGI bundling error
>
> add-osgi:
>  [echo] add-osgi
>
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/output/build/lib/annotations-api.jar
> true
>   [bnd] 1 ERRORS
>   [bnd]  Invalid value for Bundle-Version,
> ${version_cleanup;9.0.0-native-image-dev} does not match
> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>   [bnd]
>
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/res/bnd/annotations-api.jar.tmp.bnd:
> bnd failed
>   [bnd] at
> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>   [bnd] at
>
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>   [bnd] at
> sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
> Source)
>   [bnd] at
>
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>   [bnd] at
>
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>   [bnd] at
> org.apache.tools.ant.Target.execute(Target.java:449)
>   [bnd] at
> org.apache.tools.ant.Target.performTasks(Target.java:470)
>   [bnd] at
>
> org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
>   [bnd] at
>
> org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:36)
>   [bnd] at
> org.apache.tools.ant.Project.executeTargets(Project.java:1254)
>   [bnd] at
> org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:437)
>   [bnd] at
>
> org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:106)
>   [bnd] at
>
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>   [bnd] at
> sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
> Source)
>   [bnd] at
>
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>   [bnd] at
>
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>   [bnd] at java.util.Vector.forEach(Vector.java:1249)
>   [bnd] at
>
> org.apache.tools.ant.taskdefs.Sequential.execute(Sequential.java:67)
>   [bnd] at
>
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>   [bnd] at
> sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
> Source)
>   [bnd] at
>
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>   [bnd] at
>
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>   [bnd] at 

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

On Tue, Jun 23, 2020 at 3:09 PM Raymond Auge 
wrote:

> Also, at the root of 9.0.x I hard coded the value of:
>

of course I meant HEAD (caed3194b48ccbbac0572417b0e60807683a8690)

I'm not sure what you're missing. But it builds in CI does it not?

- Ray


>
> Bundle-Version: ${version_cleanup;9.0.0-native-image-dev}
>
> and the result was no error and bundles have:
>
> Bundle-Version: 9.0.0.native-image-dev
>
> - Ray
>
> On Tue, Jun 23, 2020 at 3:02 PM Raymond Auge 
> wrote:
>
>> See https://bz.apache.org/bugzilla/show_bug.cgi?id=64498
>>
>> On Tue, Jun 23, 2020 at 2:57 PM Raymond Auge 
>> wrote:
>>
>>> This is not a good fix. This is the same problem we had before with
>>> incompatible version syntax in OSGi.
>>>
>>> - Ray
>>>
>>> On Tue, Jun 23, 2020 at 2:54 PM  wrote:
>>>
 This is an automated email from the ASF dual-hosted git repository.

 fhanik pushed a commit to branch 9.0.x
 in repository https://gitbox.apache.org/repos/asf/tomcat.git


 The following commit(s) were added to refs/heads/9.0.x by this push:
  new caed319  Fixes OSGI bundling error
 caed319 is described below

 commit caed3194b48ccbbac0572417b0e60807683a8690
 Author: Filip Hanik 
 AuthorDate: Tue Jun 23 11:53:08 2020 -0700

 Fixes OSGI bundling error

 add-osgi:
  [echo] add-osgi

 /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/output/build/lib/annotations-api.jar
 true
   [bnd] 1 ERRORS
   [bnd]  Invalid value for Bundle-Version,
 ${version_cleanup;9.0.0-native-image-dev} does not match
 [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
   [bnd]

 /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/res/bnd/annotations-api.jar.tmp.bnd:
 bnd failed
   [bnd] at
 aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
   [bnd] at
 org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
   [bnd] at
 sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
 Source)
   [bnd] at

 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
   [bnd] at

 org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
   [bnd] at
 org.apache.tools.ant.Target.execute(Target.java:449)
   [bnd] at
 org.apache.tools.ant.Target.performTasks(Target.java:470)
   [bnd] at
 org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
   [bnd] at

 org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:36)
   [bnd] at
 org.apache.tools.ant.Project.executeTargets(Project.java:1254)
   [bnd] at
 org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:437)
   [bnd] at

 org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:106)
   [bnd] at
 org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
   [bnd] at
 sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
 Source)
   [bnd] at

 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
   [bnd] at

 org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
   [bnd] at java.util.Vector.forEach(Vector.java:1249)
   [bnd] at
 org.apache.tools.ant.taskdefs.Sequential.execute(Sequential.java:67)
   [bnd] at
 org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
   [bnd] at
 sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
 Source)
   [bnd] at

 sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
   [bnd] at

 org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
   [bnd] at

 org.apache.tools.ant.taskdefs.MacroInstance.execute(MacroInstance.java:391)
   [bnd] at
 org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
   [bnd] at
 

RE: [tomcat] branch 9.0.x updated: Make `ant -f mvn-pub.xml generic-install` work with the new ant tasks

[Filip Hanik]

Using outlook client, let's see if inline is working.

-Original Message-
From: Konstantin Kolinko  
Sent: Tuesday, June 23, 2020 11:36 AM
To: Tomcat Developers List 
Subject: Re: [tomcat] branch 9.0.x updated: Make `ant -f mvn-pub.xml 
generic-install` work with the new ant tasks

вт, 23 июн. 2020 г. в 21:12, :
>
> This is an automated email from the ASF dual-hosted git repository.
>
> fhanik pushed a commit to branch 9.0.x in repository 
> https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitb
> ox.apache.org%2Frepos%2Fasf%2Ftomcat.gitdata=02%7C01%7Cfhanik%40v
> mware.com%7Cac447e5f1a7e2d9f08d817a441a0%7Cb39138ca3cee4b4aa4d6cd8
> 3d9dd62f0%7C0%7C0%7C637285341532942037sdata=QdBU7HneXndHvtLeai%2F
> brr1jHfcXAmmzcAcvbzej2Js%3Dreserved=0
>
>
> The following commit(s) were added to refs/heads/9.0.x by this push:
>  new 919183b  Make `ant -f mvn-pub.xml generic-install` work with 
> the new ant tasks 919183b is described below
>
> commit 919183b438e1a2f0004082c69e34accc0c3e2f16
> Author: Filip Hanik 
> AuthorDate: Tue Jun 23 11:11:24 2020 -0700
>
> Make `ant -f mvn-pub.xml generic-install` work with the new ant 
> tasks

1) What is meant by "new tasks"?

Filip:
We switched the ant tasks for Maven 
https://github.com/apache/tomcat/commit/5db7d814d046e8aa39ea2252343fba386a497f2e#diff-8009cab2171819dc35701f82f3b196b6

I see that mvn.properties.default has
maven-resolver-ant-tasks.version=1.2.0

Does it need an update to 1.2.1 (the latest version at Maven Central, dated 
2020-05-29)?
Or is it about some upcoming/snapshot version?

Filip:
I don't think so. The new task  doesn't have a file attribute.

2) This is 9.0.x. The master/10.0.x branch has not been updated yet.

Filip: Coming up

> ---
>  res/maven/mvn-pub.xml | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml index 
> ea504a2..15e9380 100644
> --- a/res/maven/mvn-pub.xml
> +++ b/res/maven/mvn-pub.xml
> @@ -50,8 +50,11 @@
>
>  
>
> -
> +
> +  
>
> +  
> +   + if:set="gpg.passphrase"/>
>  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional 
commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

Also, at the root of 9.0.x I hard coded the value of:

Bundle-Version: ${version_cleanup;9.0.0-native-image-dev}

and the result was no error and bundles have:

Bundle-Version: 9.0.0.native-image-dev

- Ray

On Tue, Jun 23, 2020 at 3:02 PM Raymond Auge 
wrote:

> See https://bz.apache.org/bugzilla/show_bug.cgi?id=64498
>
> On Tue, Jun 23, 2020 at 2:57 PM Raymond Auge 
> wrote:
>
>> This is not a good fix. This is the same problem we had before with
>> incompatible version syntax in OSGi.
>>
>> - Ray
>>
>> On Tue, Jun 23, 2020 at 2:54 PM  wrote:
>>
>>> This is an automated email from the ASF dual-hosted git repository.
>>>
>>> fhanik pushed a commit to branch 9.0.x
>>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>>
>>>
>>> The following commit(s) were added to refs/heads/9.0.x by this push:
>>>  new caed319  Fixes OSGI bundling error
>>> caed319 is described below
>>>
>>> commit caed3194b48ccbbac0572417b0e60807683a8690
>>> Author: Filip Hanik 
>>> AuthorDate: Tue Jun 23 11:53:08 2020 -0700
>>>
>>> Fixes OSGI bundling error
>>>
>>> add-osgi:
>>>  [echo] add-osgi
>>>
>>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/output/build/lib/annotations-api.jar
>>> true
>>>   [bnd] 1 ERRORS
>>>   [bnd]  Invalid value for Bundle-Version,
>>> ${version_cleanup;9.0.0-native-image-dev} does not match
>>> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>>>   [bnd]
>>>
>>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/res/bnd/annotations-api.jar.tmp.bnd:
>>> bnd failed
>>>   [bnd] at
>>> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>>>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>>>   [bnd] at
>>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>>   [bnd] at
>>> sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>>> Source)
>>>   [bnd] at
>>>
>>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>>   [bnd] at
>>>
>>> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>>>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>>>   [bnd] at
>>> org.apache.tools.ant.Target.execute(Target.java:449)
>>>   [bnd] at
>>> org.apache.tools.ant.Target.performTasks(Target.java:470)
>>>   [bnd] at
>>> org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
>>>   [bnd] at
>>>
>>> org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:36)
>>>   [bnd] at
>>> org.apache.tools.ant.Project.executeTargets(Project.java:1254)
>>>   [bnd] at
>>> org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:437)
>>>   [bnd] at
>>> org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:106)
>>>   [bnd] at
>>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>>   [bnd] at
>>> sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>>> Source)
>>>   [bnd] at
>>>
>>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>>   [bnd] at
>>>
>>> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>>>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>>>   [bnd] at java.util.Vector.forEach(Vector.java:1249)
>>>   [bnd] at
>>> org.apache.tools.ant.taskdefs.Sequential.execute(Sequential.java:67)
>>>   [bnd] at
>>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>>   [bnd] at
>>> sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>>> Source)
>>>   [bnd] at
>>>
>>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>>   [bnd] at
>>>
>>> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>>>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>>>   [bnd] at
>>>
>>> org.apache.tools.ant.taskdefs.MacroInstance.execute(MacroInstance.java:391)
>>>   [bnd] at
>>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>>   [bnd] at
>>> sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>>> Source)
>>>   [bnd] at
>>>
>>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>>   [bnd] at
>>>
>>> 

RE: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Filip Hanik]

From: Raymond Auge 
Sent: Tuesday, June 23, 2020 11:58 AM
To: Tomcat Developers List 
Subject: Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

This is not a good fix. This is the same problem we had before with 
incompatible version syntax in OSGi

- Ray


Hi Ray, I can’t even build the libraries with your commit. What am I missing?

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

See https://bz.apache.org/bugzilla/show_bug.cgi?id=64498

On Tue, Jun 23, 2020 at 2:57 PM Raymond Auge 
wrote:

> This is not a good fix. This is the same problem we had before with
> incompatible version syntax in OSGi.
>
> - Ray
>
> On Tue, Jun 23, 2020 at 2:54 PM  wrote:
>
>> This is an automated email from the ASF dual-hosted git repository.
>>
>> fhanik pushed a commit to branch 9.0.x
>> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>>
>>
>> The following commit(s) were added to refs/heads/9.0.x by this push:
>>  new caed319  Fixes OSGI bundling error
>> caed319 is described below
>>
>> commit caed3194b48ccbbac0572417b0e60807683a8690
>> Author: Filip Hanik 
>> AuthorDate: Tue Jun 23 11:53:08 2020 -0700
>>
>> Fixes OSGI bundling error
>>
>> add-osgi:
>>  [echo] add-osgi
>>
>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/output/build/lib/annotations-api.jar
>> true
>>   [bnd] 1 ERRORS
>>   [bnd]  Invalid value for Bundle-Version,
>> ${version_cleanup;9.0.0-native-image-dev} does not match
>> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>>   [bnd]
>>
>> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/res/bnd/annotations-api.jar.tmp.bnd:
>> bnd failed
>>   [bnd] at
>> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>>   [bnd] at
>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>> Source)
>>   [bnd] at
>>
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>   [bnd] at
>>
>> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>>   [bnd] at
>> org.apache.tools.ant.Target.execute(Target.java:449)
>>   [bnd] at
>> org.apache.tools.ant.Target.performTasks(Target.java:470)
>>   [bnd] at
>> org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
>>   [bnd] at
>>
>> org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:36)
>>   [bnd] at
>> org.apache.tools.ant.Project.executeTargets(Project.java:1254)
>>   [bnd] at
>> org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:437)
>>   [bnd] at
>> org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:106)
>>   [bnd] at
>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>> Source)
>>   [bnd] at
>>
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>   [bnd] at
>>
>> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>>   [bnd] at java.util.Vector.forEach(Vector.java:1249)
>>   [bnd] at
>> org.apache.tools.ant.taskdefs.Sequential.execute(Sequential.java:67)
>>   [bnd] at
>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>> Source)
>>   [bnd] at
>>
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>   [bnd] at
>>
>> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>>   [bnd] at
>>
>> org.apache.tools.ant.taskdefs.MacroInstance.execute(MacroInstance.java:391)
>>   [bnd] at
>> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
>> Source)
>>   [bnd] at
>>
>> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>>   [bnd] at
>>
>> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>>   [bnd] at
>> org.apache.tools.ant.Target.execute(Target.java:449)
>>   [bnd] at
>> org.apache.tools.ant.Target.performTasks(Target.java:470)
>>   [bnd] at
>> org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
>> 

Re: [tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[Raymond Auge]

This is not a good fix. This is the same problem we had before with
incompatible version syntax in OSGi.

- Ray

On Tue, Jun 23, 2020 at 2:54 PM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> fhanik pushed a commit to branch 9.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/9.0.x by this push:
>  new caed319  Fixes OSGI bundling error
> caed319 is described below
>
> commit caed3194b48ccbbac0572417b0e60807683a8690
> Author: Filip Hanik 
> AuthorDate: Tue Jun 23 11:53:08 2020 -0700
>
> Fixes OSGI bundling error
>
> add-osgi:
>  [echo] add-osgi
>
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/output/build/lib/annotations-api.jar
> true
>   [bnd] 1 ERRORS
>   [bnd]  Invalid value for Bundle-Version,
> ${version_cleanup;9.0.0-native-image-dev} does not match
> [0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
>   [bnd]
>
> /development/pivotal/cloudfoundry/spring-projects/graal/tomcat/res/bnd/annotations-api.jar.tmp.bnd:
> bnd failed
>   [bnd] at
> aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
>   [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
>   [bnd] at
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
> Source)
>   [bnd] at
>
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>   [bnd] at
>
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>   [bnd] at org.apache.tools.ant.Target.execute(Target.java:449)
>   [bnd] at
> org.apache.tools.ant.Target.performTasks(Target.java:470)
>   [bnd] at
> org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
>   [bnd] at
>
> org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:36)
>   [bnd] at
> org.apache.tools.ant.Project.executeTargets(Project.java:1254)
>   [bnd] at
> org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:437)
>   [bnd] at
> org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:106)
>   [bnd] at
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
> Source)
>   [bnd] at
>
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>   [bnd] at
>
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>   [bnd] at java.util.Vector.forEach(Vector.java:1249)
>   [bnd] at
> org.apache.tools.ant.taskdefs.Sequential.execute(Sequential.java:67)
>   [bnd] at
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
> Source)
>   [bnd] at
>
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>   [bnd] at
>
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>   [bnd] at
>
> org.apache.tools.ant.taskdefs.MacroInstance.execute(MacroInstance.java:391)
>   [bnd] at
> org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
>   [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
> Source)
>   [bnd] at
>
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
>   [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
>   [bnd] at
>
> org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
>   [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
>   [bnd] at org.apache.tools.ant.Target.execute(Target.java:449)
>   [bnd] at
> org.apache.tools.ant.Target.performTasks(Target.java:470)
>   [bnd] at
> org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
>   [bnd] at
> org.apache.tools.ant.Project.executeTarget(Project.java:1364)
>   [bnd] at
>
> org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
>   [bnd] at
> 

[tomcat] branch 9.0.x updated: Fixes OSGI bundling error

[fhanik]

This is an automated email from the ASF dual-hosted git repository.

fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new caed319  Fixes OSGI bundling error
caed319 is described below

commit caed3194b48ccbbac0572417b0e60807683a8690
Author: Filip Hanik 
AuthorDate: Tue Jun 23 11:53:08 2020 -0700

Fixes OSGI bundling error

add-osgi:
 [echo] add-osgi

/development/pivotal/cloudfoundry/spring-projects/graal/tomcat/output/build/lib/annotations-api.jar
true
  [bnd] 1 ERRORS
  [bnd]  Invalid value for Bundle-Version,
${version_cleanup;9.0.0-native-image-dev} does not match
[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9]{1,9}(\.[0-9A-Za-z_-]+)?)?)?
  [bnd]

/development/pivotal/cloudfoundry/spring-projects/graal/tomcat/res/bnd/annotations-api.jar.tmp.bnd:
bnd failed
  [bnd] at
aQute.bnd.ant.BndTask.executeBackwardCompatible(BndTask.java:240)
  [bnd] at aQute.bnd.ant.BndTask.execute(BndTask.java:119)
  [bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
  [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
  [bnd] at

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
  [bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
  [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
  [bnd] at org.apache.tools.ant.Target.execute(Target.java:449)
  [bnd] at
org.apache.tools.ant.Target.performTasks(Target.java:470)
  [bnd] at
org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
  [bnd] at

org.apache.tools.ant.helper.SingleCheckExecutor.executeTargets(SingleCheckExecutor.java:36)
  [bnd] at
org.apache.tools.ant.Project.executeTargets(Project.java:1254)
  [bnd] at
org.apache.tools.ant.taskdefs.Ant.execute(Ant.java:437)
  [bnd] at
org.apache.tools.ant.taskdefs.CallTarget.execute(CallTarget.java:106)
  [bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
  [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
  [bnd] at

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
  [bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
  [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
  [bnd] at java.util.Vector.forEach(Vector.java:1249)
  [bnd] at
org.apache.tools.ant.taskdefs.Sequential.execute(Sequential.java:67)
  [bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
  [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
  [bnd] at

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
  [bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
  [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
  [bnd] at
org.apache.tools.ant.taskdefs.MacroInstance.execute(MacroInstance.java:391)
  [bnd] at
org.apache.tools.ant.UnknownElement.execute(UnknownElement.java:292)
  [bnd] at sun.reflect.GeneratedMethodAccessor4.invoke(Unknown
Source)
  [bnd] at

sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
  [bnd] at java.lang.reflect.Method.invoke(Method.java:498)
  [bnd] at
org.apache.tools.ant.dispatch.DispatchUtils.execute(DispatchUtils.java:99)
  [bnd] at org.apache.tools.ant.Task.perform(Task.java:350)
  [bnd] at org.apache.tools.ant.Target.execute(Target.java:449)
  [bnd] at
org.apache.tools.ant.Target.performTasks(Target.java:470)
  [bnd] at
org.apache.tools.ant.Project.executeSortedTargets(Project.java:1391)
  [bnd] at
org.apache.tools.ant.Project.executeTarget(Project.java:1364)
  [bnd] at

org.apache.tools.ant.helper.DefaultExecutor.executeTargets(DefaultExecutor.java:41)
  [bnd] at
org.apache.tools.ant.Project.executeTargets(Project.java:1254)
  [bnd] at org.apache.tools.ant.Main.runBuild(Main.java:830)
  [bnd] at org.apache.tools.ant.Main.startAnt(Main.java:223)
  [bnd] at
org.apache.tools.ant.launch.Launcher.run(Launcher.java:284)
  [bnd] 

Re: [tomcat] branch 9.0.x updated: Make `ant -f mvn-pub.xml generic-install` work with the new ant tasks

[Konstantin Kolinko]

вт, 23 июн. 2020 г. в 21:12, :
>
> This is an automated email from the ASF dual-hosted git repository.
>
> fhanik pushed a commit to branch 9.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/9.0.x by this push:
>  new 919183b  Make `ant -f mvn-pub.xml generic-install` work with the new 
> ant tasks
> 919183b is described below
>
> commit 919183b438e1a2f0004082c69e34accc0c3e2f16
> Author: Filip Hanik 
> AuthorDate: Tue Jun 23 11:11:24 2020 -0700
>
> Make `ant -f mvn-pub.xml generic-install` work with the new ant tasks

1) What is meant by "new tasks"?
I see that mvn.properties.default has
maven-resolver-ant-tasks.version=1.2.0

Does it need an update to 1.2.1 (the latest version at Maven Central,
dated 2020-05-29)?
Or is it about some upcoming/snapshot version?

2) This is 9.0.x. The master/10.0.x branch has not been updated yet.


> ---
>  res/maven/mvn-pub.xml | 5 -
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
> index ea504a2..15e9380 100644
> --- a/res/maven/mvn-pub.xml
> +++ b/res/maven/mvn-pub.xml
> @@ -50,8 +50,11 @@
>
>  
>
> -
> +
> +  
>
> +  
> +  
>  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Make `ant -f mvn-pub.xml generic-install` work with the new ant tasks

[fhanik]

This is an automated email from the ASF dual-hosted git repository.

fhanik pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 919183b  Make `ant -f mvn-pub.xml generic-install` work with the new 
ant tasks
919183b is described below

commit 919183b438e1a2f0004082c69e34accc0c3e2f16
Author: Filip Hanik 
AuthorDate: Tue Jun 23 11:11:24 2020 -0700

Make `ant -f mvn-pub.xml generic-install` work with the new ant tasks
---
 res/maven/mvn-pub.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/res/maven/mvn-pub.xml b/res/maven/mvn-pub.xml
index ea504a2..15e9380 100644
--- a/res/maven/mvn-pub.xml
+++ b/res/maven/mvn-pub.xml
@@ -50,8 +50,11 @@
   
 
 
-
+
+  
   
+  
+  
 
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: smoke tests for the runtime

[Raymond Auge]

On Tue, Jun 23, 2020 at 10:54 AM Mark Thomas  wrote:

> On 23/06/2020 14:04, Raymond Auge wrote:
> > Hey all,
> >
> > Is there a set of tests that run against a real tomcat runtime anywhere
> > in the project already? I haven't found any and I'd like to put
> > something together that would run against base configurations of Tomcat
> > running in JPMS and OSGi modes.
>
> If I want a trivial smoke test I play the snake game from the examples
> across a couple of browsers.
>

This is what I've been doing, going through several of the examples to
assure they don't blow up :D


>
> If you want something more comprehensive you could use the Servlet TCK
> or the JSP TCK although getting them set up can be non-trivial.
>
> https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs
>
> That would work for 9.0.x or 10.0.x as long as you use the right TCK
> version.
>

Interesting, a little heavier than I hoped but maybe a trimmed version of
this could be used.


>
> Another option I often use is Jira. Download the eval version, build the
> WAR (I don't think you can download a WAR directly but it has been a
> while) and see if Jira starts.
>
> That is only going to work for Tomcat 9 at this point.
>

That's a bigger limitation than I like since I'm specifically wishing to
make sure both master and 9.0.x continue to work.

Thanks Mark! I'll consider this.

- Ray


>
> Mark
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

[Bug 64541] Parsing of mbeans-descriptor.xml files throw errors on server startup

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64541

--- Comment #10 from Christopher Schultz  ---
Modifying our existing (copy of) DTD is definitely an option. None of the J*EE
DTDs are parsable without entity-expansion, either, though. I haven't
pulled-down the entire tree of schemas recently, but I thought at some point
they themselves relied on entity-expansion as well.

-- 
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

Re: smoke tests for the runtime

[Mark Thomas]

On 23/06/2020 14:04, Raymond Auge wrote:
> Hey all,
> 
> Is there a set of tests that run against a real tomcat runtime anywhere
> in the project already? I haven't found any and I'd like to put
> something together that would run against base configurations of Tomcat
> running in JPMS and OSGi modes.

If I want a trivial smoke test I play the snake game from the examples
across a couple of browsers.

If you want something more comprehensive you could use the Servlet TCK
or the JSP TCK although getting them set up can be non-trivial.

https://cwiki.apache.org/confluence/display/TOMCAT/Jakarta+EE+TCKs

That would work for 9.0.x or 10.0.x as long as you use the right TCK
version.

Another option I often use is Jira. Download the eval version, build the
WAR (I don't think you can download a WAR directly but it has been a
while) and see if Jira starts.

That is only going to work for Tomcat 9 at this point.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Fix IDE nags

[Mark Thomas]

On 23/06/2020 14:02, Rémy Maucherat wrote:



> Thanks, I always mess up that one ...

No problem. I only notice it because my IDE nags me.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64550] New: create a project module to launch Tomcat in JPMS

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64550

Bug ID: 64550
   Summary: create a project module to launch Tomcat in JPMS
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

This module could then be used for testing and as a demo.

-- 
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 64549] New: create a project module to launch Tomcat in OSGi

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64549

Bug ID: 64549
   Summary: create a project module to launch Tomcat in OSGi
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

This module could then be used for testing and as a demo.

-- 
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 64548] New: generate JPMS metadata

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64548

Bug ID: 64548
   Summary: generate JPMS metadata
   Product: Tomcat 10
   Version: unspecified
  Hardware: All
OS: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Packaging
  Assignee: dev@tomcat.apache.org
  Reporter: raymond.a...@liferay.com
  Target Milestone: --

bnd can generated JPMS metadata. Use this to make tomcat artifacts proper JPMS
modules.

This will require special treatment between master (Tomcat 10) and 9.0.x
branches.

-- 
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 64544] add built libs to the bnd classpath for introspection

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64544

rotty3000  changed:

   What|Removed |Added

 OS|Linux   |All
   Hardware|PC  |All

-- 
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

smoke tests for the runtime

[Raymond Auge]

Hey all,

Is there a set of tests that run against a real tomcat runtime anywhere in
the project already? I haven't found any and I'd like to put something
together that would run against base configurations of Tomcat running in
JPMS and OSGi modes.

-- 
*Raymond Augé* 
 (@rotty3000)
Senior Software Architect *Liferay, Inc.* 
 (@Liferay)

Re: [tomcat] branch master updated: Fix IDE nags

[Rémy Maucherat]

On Tue, Jun 23, 2020 at 1:08 PM  wrote:

> 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 8e86977  Fix IDE nags
> 8e86977 is described below
>
> commit 8e86977b901698c2c67dbaf83f4dba5d7f2c1e02
> Author: Mark Thomas 
> AuthorDate: Tue Jun 23 12:08:20 2020 +0100
>
> Fix IDE nags
> ---
>  java/org/apache/catalina/startup/Catalina.java | 4 ++--
>  java/org/apache/catalina/startup/SetAllPropertiesRule.java | 1 +
>  java/org/apache/catalina/startup/SetContextPropertiesRule.java | 1 +
>  3 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/java/org/apache/catalina/startup/Catalina.java
> b/java/org/apache/catalina/startup/Catalina.java
> index 5280d32..a0955c1 100644
> --- a/java/org/apache/catalina/startup/Catalina.java
> +++ b/java/org/apache/catalina/startup/Catalina.java
> @@ -720,7 +720,7 @@ public class Catalina {
>  }
>
>  if(log.isInfoEnabled()) {
> -log.info(sm.getString("catalina.init",
> TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
> +log.info(sm.getString("catalina.init",
> Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1;
>  }
>  }
>
> @@ -770,7 +770,7 @@ public class Catalina {
>  }
>
>  if (log.isInfoEnabled()) {
> -log.info(sm.getString("catalina.startup",
> TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
> +log.info(sm.getString("catalina.startup",
> Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1;
>  }
>
>  // Register shutdown hook
> diff --git a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
> b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
> index 93d59e9..7288fe6 100644
> --- a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
> +++ b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
> @@ -26,6 +26,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
>   * @author Remy Maucherat
>   * @deprecated This will be removed in Tomcat 10
>   */
> +@Deprecated
>  public class SetAllPropertiesRule extends SetPropertiesRule {
>

Thanks, I always mess up that one ...

Rémy


>
>
> diff --git
> a/java/org/apache/catalina/startup/SetContextPropertiesRule.java
> b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
> index fda8742..36ad6a9 100644
> --- a/java/org/apache/catalina/startup/SetContextPropertiesRule.java
> +++ b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
> @@ -27,6 +27,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
>   * @author Remy Maucherat
>   * @deprecated This will be removed in Tomcat 10
>   */
> +@Deprecated
>  public class SetContextPropertiesRule extends SetPropertiesRule {
>
>
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

[tomcat] branch master updated: Remove unused deprecated classes

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 88e06fc  Remove unused deprecated classes
88e06fc is described below

commit 88e06fc1483feac111f198e9c0c7ff0fcdf9aad6
Author: remm 
AuthorDate: Tue Jun 23 14:06:08 2020 +0200

Remove unused deprecated classes
---
 .../catalina/startup/SetAllPropertiesRule.java | 42 
 .../catalina/startup/SetContextPropertiesRule.java | 46 --
 2 files changed, 88 deletions(-)

diff --git a/java/org/apache/catalina/startup/SetAllPropertiesRule.java 
b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
deleted file mode 100644
index 7288fe6..000
--- a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.catalina.startup;
-
-import org.apache.tomcat.util.digester.SetPropertiesRule;
-
-/**
- * Rule that uses the introspection utils to set properties.
- *
- * @author Remy Maucherat
- * @deprecated This will be removed in Tomcat 10
- */
-@Deprecated
-public class SetAllPropertiesRule extends SetPropertiesRule {
-
-
-// --- Constructors
-public SetAllPropertiesRule() {
-super();
-}
-
-public SetAllPropertiesRule(String[] exclude) {
-super(exclude);
-}
-
-}
diff --git a/java/org/apache/catalina/startup/SetContextPropertiesRule.java 
b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
deleted file mode 100644
index 36ad6a9..000
--- a/java/org/apache/catalina/startup/SetContextPropertiesRule.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-package org.apache.catalina.startup;
-
-import org.apache.tomcat.util.digester.SetPropertiesRule;
-
-/**
- * Rule that uses the introspection utils to set properties of a context
- * (everything except "path").
- *
- * @author Remy Maucherat
- * @deprecated This will be removed in Tomcat 10
- */
-@Deprecated
-public class SetContextPropertiesRule extends SetPropertiesRule {
-
-
-// --- Constructors
-
-public SetContextPropertiesRule() {
-super(new String[]{"path", "docBase"});
-}
-
-// - Instance Variables
-
-
-// - Public Methods
-
-
-}


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 03/05: Do the code generation tooling for context.xml files

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 1d10b19c7ced08d6f81e8c93a67d321a1307c47f
Author: remm 
AuthorDate: Mon Jun 22 17:20:24 2020 +0200

Do the code generation tooling for context.xml files

Drop the hack that used the hash code to create variable names since it
does not work, instead a list of objects used had to be kept. The names
are more readable so it's not a bad move anyway.
Using the generated code (beyond looking for a Tomcat embedded example)
during load will be done only when using an explicit flag.
I will document this tooling.
Most likely some additional escaping and fixes are needed.
---
 java/org/apache/catalina/startup/Catalina.java |  84 +---
 .../org/apache/catalina/startup/ContextConfig.java | 231 +++--
 .../catalina/startup/ListenerCreateRule.java   |  12 +-
 .../apache/catalina/startup/SetNextNamingRule.java |  12 +-
 .../org/apache/tomcat/util/IntrospectionUtils.java |  31 ++-
 .../tomcat/util/descriptor/web/ContextEjb.java |   5 -
 .../util/descriptor/web/ContextEnvironment.java|   3 -
 .../tomcat/util/descriptor/web/ContextHandler.java |   4 -
 .../util/descriptor/web/ContextLocalEjb.java   |   4 -
 .../util/descriptor/web/ContextResource.java   |   4 -
 .../util/descriptor/web/ContextResourceEnvRef.java |   4 -
 .../util/descriptor/web/ContextResourceLink.java   |   4 -
 .../tomcat/util/descriptor/web/ContextService.java |   4 -
 .../util/descriptor/web/MessageDestination.java|   4 -
 .../util/descriptor/web/MessageDestinationRef.java |   4 -
 .../tomcat/util/descriptor/web/ResourceBase.java   |  10 -
 .../tomcat/util/digester/CallMethodRule.java   |   6 +-
 java/org/apache/tomcat/util/digester/Digester.java |  30 ++-
 18 files changed, 346 insertions(+), 110 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index b03d4ce..5e6bb12 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -135,11 +135,17 @@ public class Catalina {
 
 
 /**
- * Generate Tomcat embedded code from server.xml.
+ * Generate Tomcat embedded code from configuration files.
  */
 protected boolean generateCode = false;
 
 
+/**
+ * Use generated code as a replacement for configuration files.
+ */
+protected boolean useGeneratedCode = false;
+
+
 // --- Constructors
 
 public Catalina() {
@@ -170,6 +176,26 @@ public class Catalina {
 }
 
 
+public boolean getGenerateCode() {
+return this.generateCode;
+}
+
+
+public void setGenerateCode(boolean generateCode) {
+this.generateCode = generateCode;
+}
+
+
+public boolean getUseGeneratedCode() {
+return this.useGeneratedCode;
+}
+
+
+public void setUseGeneratedCode(boolean useGeneratedCode) {
+this.useGeneratedCode = useGeneratedCode;
+}
+
+
 /**
  * Set the shared extensions class loader.
  *
@@ -247,6 +273,8 @@ public class Catalina {
 isConfig = true;
 } else if (arg.equals("-generateCode")) {
 generateCode = true;
+} else if (arg.equals("-useGeneratedCode")) {
+useGeneratedCode = true;
 } else if (arg.equals("-nonaming")) {
 setUseNaming(false);
 } else if (arg.equals("-help")) {
@@ -558,50 +586,49 @@ public class Catalina {
 ConfigFileLoader.setSource(new 
CatalinaBaseConfigurationSource(Bootstrap.getCatalinaBaseFile(), 
getConfigFile()));
 File file = configFile();
 
-try (ConfigurationSource.Resource resource = 
ConfigFileLoader.getSource().getServerXml()) {
-String serverXmlId = String.valueOf(resource.getLastModified());
-String serverXmlClassName = "catalina.ServerXml_" + serverXmlId;
-ServerXml serverXml = null;
+ServerXml serverXml = null;
+if (useGeneratedCode) {
+String xmlClassName = "catalina.ServerXml";
 try {
-serverXml = (ServerXml) 
Catalina.class.getClassLoader().loadClass(serverXmlClassName).newInstance();
-} catch (ClassNotFoundException e) {
+serverXml = (ServerXml) 
Catalina.class.getClassLoader().loadClass(xmlClassName).newInstance();
+} catch (Exception e) {
 // Ignore, no generated code found
 }
-if (serverXml != null) {
-serverXml.load(this);
-} else {
+}
+
+if (serverXml != null) {
+serverXml.load(this);
+} else {
+try (ConfigurationSource.Resource resource = 
ConfigFileLoader.getSource().getServerXml()) {
 // 

[tomcat] 04/05: Various improvements to code generation

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 0306b6b0eda5d8225c725af932af441d0299f40e
Author: remm 
AuthorDate: Tue Jun 23 12:02:48 2020 +0200

Various improvements to code generation

Add a configuration for the location of the generated sources.
Catalina start and stop will now use the same code. As a result, stop
will now use the configuration source and will also generate stop code.
If the use generated flag is enabled, ContextConfig will not look at the
real files at all, this is just simpler (and there could be 100s of
webapps too).
Pass arguments from Tomcat to Catalina, since in addition to educational
uses, the feature would be useful with AOT compilation.
---
 java/org/apache/catalina/startup/Catalina.java | 177 +
 .../catalina/startup/ConnectorCreateRule.java  |   1 +
 .../org/apache/catalina/startup/ContextConfig.java |  39 +++--
 .../catalina/startup/LocalStrings.properties   |   3 +-
 java/org/apache/catalina/startup/Tomcat.java   |  39 -
 .../tomcat/util/digester/ObjectCreateRule.java |   1 +
 .../tomcat/util/digester/SetPropertiesRule.java|   3 -
 webapps/docs/changelog.xml |   4 +
 8 files changed, 182 insertions(+), 85 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index 5e6bb12..d2456d6 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -18,7 +18,6 @@ package org.apache.catalina.startup;
 
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -141,6 +140,18 @@ public class Catalina {
 
 
 /**
+ * Location of generated sources.
+ */
+protected File generatedCodeLocation = null;
+
+
+/**
+ * Value of the argument.
+ */
+protected String generatedCodeLocationParameter = null;
+
+
+/**
  * Use generated code as a replacement for configuration files.
  */
 protected boolean useGeneratedCode = false;
@@ -196,6 +207,16 @@ public class Catalina {
 }
 
 
+public File getGeneratedCodeLocation() {
+return this.generatedCodeLocation;
+}
+
+
+public void setGeneratedCodeLocation(File generatedCodeLocation) {
+this.generatedCodeLocation = generatedCodeLocation;
+}
+
+
 /**
  * Set the shared extensions class loader.
  *
@@ -259,6 +280,7 @@ public class Catalina {
 protected boolean arguments(String args[]) {
 
 boolean isConfig = false;
+boolean isGenerateCode = false;
 
 if (args.length < 1) {
 usage();
@@ -272,20 +294,29 @@ public class Catalina {
 } else if (arg.equals("-config")) {
 isConfig = true;
 } else if (arg.equals("-generateCode")) {
-generateCode = true;
+setGenerateCode(true);
+isGenerateCode = true;
 } else if (arg.equals("-useGeneratedCode")) {
-useGeneratedCode = true;
+setUseGeneratedCode(true);
+isGenerateCode = false;
 } else if (arg.equals("-nonaming")) {
 setUseNaming(false);
+isGenerateCode = false;
 } else if (arg.equals("-help")) {
 usage();
 return false;
 } else if (arg.equals("start")) {
+isGenerateCode = false;
 // NOOP
 } else if (arg.equals("configtest")) {
+isGenerateCode = false;
 // NOOP
 } else if (arg.equals("stop")) {
+isGenerateCode = false;
 // NOOP
+} else if (isGenerateCode) {
+generatedCodeLocationParameter = arg;
+isGenerateCode = false;
 } else {
 usage();
 return false;
@@ -502,6 +533,72 @@ public class Catalina {
 }
 
 
+protected void parseServerXml(boolean start) {
+// Set configuration source
+ConfigFileLoader.setSource(new 
CatalinaBaseConfigurationSource(Bootstrap.getCatalinaBaseFile(), 
getConfigFile()));
+File file = configFile();
+
+// Init source location
+File serverXmlLocation = null;
+if (generateCode) {
+if (generatedCodeLocationParameter != null) {
+generatedCodeLocation = new 
File(generatedCodeLocationParameter);
+if (!generatedCodeLocation.isAbsolute()) {
+generatedCodeLocation = new 
File(Bootstrap.getCatalinaHomeFile(), generatedCodeLocationParameter);
+}
+} else {
+generatedCodeLocation = new 

[tomcat] 01/05: Add a code generator for server.xml by taking advantage of the digester

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 55ef30d459f859d92a562eed9bd1b7d080a510b4
Author: remm 
AuthorDate: Thu Jun 18 15:07:39 2020 +0200

Add a code generator for server.xml by taking advantage of the digester

This produces a Tomcat embedded out of server.xml. Only the rules used
by server.xml have code generation at the moment. The code is generated
in the work directory.
Also minor refactorings and simplifications, like for the properties
related rules which could use the main one.
For some reason, it is only marginally faster than actually using the
digester and regular XML parsing. I expected better results overall and
it could be useful to investigate.
However this still has benefits:
- It is better for AOT compilation; I will likely be moving the Tomcat
standalone "blueprint" for AOT compilation use from res/tomcat-maven to
a new module since this will eventually expand to include all the extra
steps that can benefit AOT
- It can be educational about how to use the Tomcat embedded API
- People using Tomcat embedded could use it to generate code for complex
configurations, and this guarantees server.xml equivalence
- Maybe there will be benefits if the technique is applied to the larger
and more numerous web.xml files (but it is possible other methods are
better there, I will investigate)
---
 .../apache/catalina/startup/AddPortOffsetRule.java |   7 +
 java/org/apache/catalina/startup/Catalina.java | 144 +++--
 .../catalina/startup/CertificateCreateRule.java|  11 +-
 .../catalina/startup/ConnectorCreateRule.java  |  31 -
 .../apache/catalina/startup/ContextRuleSet.java|   2 +-
 .../startup/CopyParentClassLoaderRule.java |   6 +
 .../catalina/startup/LifecycleListenerRule.java|   6 +
 .../org/apache/catalina/startup/NamingRuleSet.java |  12 +-
 .../catalina/startup/SetAllPropertiesRule.java |  52 +---
 .../catalina/startup/SetContextPropertiesRule.java |  42 +-
 .../apache/catalina/startup/SetNextNamingRule.java |   7 +
 .../org/apache/tomcat/util/IntrospectionUtils.java |  31 -
 .../tomcat/util/descriptor/web/ContextEjb.java |   4 +
 .../util/descriptor/web/ContextEnvironment.java|   4 +
 .../tomcat/util/descriptor/web/ContextHandler.java |   4 +
 .../util/descriptor/web/ContextLocalEjb.java   |   4 +
 .../util/descriptor/web/ContextResource.java   |   4 +
 .../util/descriptor/web/ContextResourceEnvRef.java |   4 +
 .../util/descriptor/web/ContextResourceLink.java   |   4 +
 .../tomcat/util/descriptor/web/ContextService.java |   4 +
 .../util/descriptor/web/MessageDestination.java|   4 +
 .../util/descriptor/web/MessageDestinationRef.java |   4 +
 .../tomcat/util/descriptor/web/ResourceBase.java   |  10 ++
 .../tomcat/util/digester/CallMethodRule.java   |  14 ++
 java/org/apache/tomcat/util/digester/Digester.java |  27 
 .../tomcat/util/digester/ObjectCreateRule.java |  10 ++
 .../apache/tomcat/util/digester/SetNextRule.java   |   6 +
 .../tomcat/util/digester/SetPropertiesRule.java|  48 ++-
 28 files changed, 362 insertions(+), 144 deletions(-)

diff --git a/java/org/apache/catalina/startup/AddPortOffsetRule.java 
b/java/org/apache/catalina/startup/AddPortOffsetRule.java
index 9b961cb..50f3fc0 100644
--- a/java/org/apache/catalina/startup/AddPortOffsetRule.java
+++ b/java/org/apache/catalina/startup/AddPortOffsetRule.java
@@ -32,5 +32,12 @@ public class AddPortOffsetRule extends Rule {
 
 int portOffset = server.getPortOffset();
 conn.setPortOffset(portOffset);
+
+StringBuilder code = digester.getGeneratedCode();
+if (code != null) {
+
code.append(digester.toVariableName(conn)).append(".setPortOffset(");
+
code.append(digester.toVariableName(server)).append(".getPortOffset());");
+code.append(System.lineSeparator());
+}
 }
 }
\ No newline at end of file
diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index 00c820e..ecf197f 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -19,6 +19,7 @@ package org.apache.catalina.startup;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -29,6 +30,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.LogManager;
 
 import org.apache.catalina.Container;
@@ -132,6 +134,19 @@ public class Catalina {
 protected boolean loaded = false;
 
 
+/**
+ * Rethrow exceptions on init failure.
+ */
+   

[tomcat] branch 9.0.x updated (e358d0d -> 05ba3d4)

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from e358d0d  Tab police
 new 55ef30d  Add a code generator for server.xml by taking advantage of 
the digester
 new 93a7a3b  Drop from merge
 new 1d10b19  Do the code generation tooling for context.xml files
 new 0306b6b  Various improvements to code generation
 new 05ba3d4  Fix IDE nags

The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/catalina/startup/AddPortOffsetRule.java |   7 +
 java/org/apache/catalina/startup/Catalina.java | 264 +++--
 .../catalina/startup/CertificateCreateRule.java|  11 +-
 .../catalina/startup/ConnectorCreateRule.java  |  32 ++-
 .../org/apache/catalina/startup/ContextConfig.java | 246 +--
 .../apache/catalina/startup/ContextRuleSet.java|   2 +-
 .../startup/CopyParentClassLoaderRule.java |   6 +
 .../catalina/startup/LifecycleListenerRule.java|   6 +
 .../catalina/startup/ListenerCreateRule.java   |  12 +-
 .../catalina/startup/LocalStrings.properties   |   3 +-
 .../org/apache/catalina/startup/NamingRuleSet.java |  12 +-
 .../catalina/startup/SetAllPropertiesRule.java |  53 +
 .../catalina/startup/SetContextPropertiesRule.java |  43 +---
 .../apache/catalina/startup/SetNextNamingRule.java |  13 +
 java/org/apache/catalina/startup/Tomcat.java   |  39 ++-
 .../org/apache/tomcat/util/IntrospectionUtils.java |  58 -
 .../tomcat/util/descriptor/web/ContextEjb.java |   1 -
 .../util/descriptor/web/ContextEnvironment.java|   1 +
 .../tomcat/util/digester/CallMethodRule.java   |  18 ++
 java/org/apache/tomcat/util/digester/Digester.java |  47 
 .../tomcat/util/digester/ObjectCreateRule.java |  11 +
 .../apache/tomcat/util/digester/SetNextRule.java   |   6 +
 .../tomcat/util/digester/SetPropertiesRule.java|  45 +++-
 webapps/docs/changelog.xml |   4 +
 24 files changed, 743 insertions(+), 197 deletions(-)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/05: Drop from merge

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 93a7a3bbc94c8afc56c7ea65fce17f2ac7c6c038
Author: remm 
AuthorDate: Tue Jun 23 13:28:50 2020 +0200

Drop from merge
---
 java/org/apache/catalina/startup/Catalina.java | 7 ---
 1 file changed, 7 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index ecf197f..b03d4ce 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -135,13 +135,6 @@ public class Catalina {
 
 
 /**
- * Rethrow exceptions on init failure.
- */
-protected boolean throwOnInitFailure =
-
Boolean.getBoolean("org.apache.catalina.startup.EXIT_ON_INIT_FAILURE");
-
-
-/**
  * Generate Tomcat embedded code from server.xml.
  */
 protected boolean generateCode = false;


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 05/05: Fix IDE nags

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 05ba3d4d1ca6261ec12967b1010d34ba7adc6ccb
Author: Mark Thomas 
AuthorDate: Tue Jun 23 12:08:20 2020 +0100

Fix IDE nags
---
 java/org/apache/catalina/startup/Catalina.java | 4 ++--
 java/org/apache/catalina/startup/SetAllPropertiesRule.java | 1 +
 java/org/apache/catalina/startup/SetContextPropertiesRule.java | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index d2456d6..215f179 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -697,7 +697,7 @@ public class Catalina {
 }
 
 if(log.isInfoEnabled()) {
-log.info(sm.getString("catalina.init", 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
+log.info(sm.getString("catalina.init", 
Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1;
 }
 }
 
@@ -747,7 +747,7 @@ public class Catalina {
 }
 
 if (log.isInfoEnabled()) {
-log.info(sm.getString("catalina.startup", 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
+log.info(sm.getString("catalina.startup", 
Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1;
 }
 
 // Register shutdown hook
diff --git a/java/org/apache/catalina/startup/SetAllPropertiesRule.java 
b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
index 93d59e9..7288fe6 100644
--- a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
+++ b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
@@ -26,6 +26,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
  * @author Remy Maucherat
  * @deprecated This will be removed in Tomcat 10
  */
+@Deprecated
 public class SetAllPropertiesRule extends SetPropertiesRule {
 
 
diff --git a/java/org/apache/catalina/startup/SetContextPropertiesRule.java 
b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
index fda8742..36ad6a9 100644
--- a/java/org/apache/catalina/startup/SetContextPropertiesRule.java
+++ b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
@@ -27,6 +27,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
  * @author Remy Maucherat
  * @deprecated This will be removed in Tomcat 10
  */
+@Deprecated
 public class SetContextPropertiesRule extends SetPropertiesRule {
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [tomcat] branch master updated: Various improvements to code generation

[Rémy Maucherat]

On Tue, Jun 23, 2020 at 12:03 PM  wrote:

> This is an automated email from the ASF dual-hosted git repository.
>
> remm 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 fd431c2  Various improvements to code generation
> fd431c2 is described below
>
> commit fd431c2f18cd1c04bc2902400fe3344fa58a656f
> Author: remm 
> AuthorDate: Tue Jun 23 12:02:48 2020 +0200
>
> Various improvements to code generation
>
> Add a configuration for the location of the generated sources.
> Catalina start and stop will now use the same code. As a result, stop
> will now use the configuration source and will also generate stop code.
> If the use generated flag is enabled, ContextConfig will not look at
> the
> real files at all, this is just simpler (and there could be 100s of
> webapps too).
> Pass arguments from Tomcat to Catalina, since in addition to
> educational
> uses, the feature would be useful with AOT compilation.
>

I plan to port this to Tomcat 9 and then document it as a possible step of
AOT compilation ( http://tomcat.apache.org/tomcat-9.0-doc/graal.html ).
I will then move the "documentation", which is in res/tomcat-maven at the
moment, to a new item in the modules focused on demonstrating packaging and
AOT compilation. Still thinking about the module name, considering
"stuffed" for that, as it is a Tomcat that won't move, so a stuffed animal.
Feel free to help me come up with a better name :)

Rémy

[tomcat] branch master updated: Fix IDE nags

[markt]

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 8e86977  Fix IDE nags
8e86977 is described below

commit 8e86977b901698c2c67dbaf83f4dba5d7f2c1e02
Author: Mark Thomas 
AuthorDate: Tue Jun 23 12:08:20 2020 +0100

Fix IDE nags
---
 java/org/apache/catalina/startup/Catalina.java | 4 ++--
 java/org/apache/catalina/startup/SetAllPropertiesRule.java | 1 +
 java/org/apache/catalina/startup/SetContextPropertiesRule.java | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index 5280d32..a0955c1 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -720,7 +720,7 @@ public class Catalina {
 }
 
 if(log.isInfoEnabled()) {
-log.info(sm.getString("catalina.init", 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
+log.info(sm.getString("catalina.init", 
Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1;
 }
 }
 
@@ -770,7 +770,7 @@ public class Catalina {
 }
 
 if (log.isInfoEnabled()) {
-log.info(sm.getString("catalina.startup", 
TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1)));
+log.info(sm.getString("catalina.startup", 
Long.toString(TimeUnit.NANOSECONDS.toMillis(System.nanoTime() - t1;
 }
 
 // Register shutdown hook
diff --git a/java/org/apache/catalina/startup/SetAllPropertiesRule.java 
b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
index 93d59e9..7288fe6 100644
--- a/java/org/apache/catalina/startup/SetAllPropertiesRule.java
+++ b/java/org/apache/catalina/startup/SetAllPropertiesRule.java
@@ -26,6 +26,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
  * @author Remy Maucherat
  * @deprecated This will be removed in Tomcat 10
  */
+@Deprecated
 public class SetAllPropertiesRule extends SetPropertiesRule {
 
 
diff --git a/java/org/apache/catalina/startup/SetContextPropertiesRule.java 
b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
index fda8742..36ad6a9 100644
--- a/java/org/apache/catalina/startup/SetContextPropertiesRule.java
+++ b/java/org/apache/catalina/startup/SetContextPropertiesRule.java
@@ -27,6 +27,7 @@ import org.apache.tomcat.util.digester.SetPropertiesRule;
  * @author Remy Maucherat
  * @deprecated This will be removed in Tomcat 10
  */
+@Deprecated
 public class SetContextPropertiesRule extends SetPropertiesRule {
 
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch 9.0.x updated: Tab police

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new e358d0d  Tab police
e358d0d is described below

commit e358d0d1dd6ef02d55c2066f8565ebf222bc9636
Author: Mark Thomas 
AuthorDate: Tue Jun 23 12:05:19 2020 +0100

Tab police
---
 res/bnd/jasper-el.jar.tmp.bnd| 4 ++--
 res/bnd/tomcat-util.jar.tmp.bnd  | 4 ++--
 res/bnd/tomcat-websocket.jar.tmp.bnd | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 45b2744..549215b 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -23,7 +23,7 @@ Export-Package: \
 org.apache.el.parser
 
 -includepackage: \
-   org.apache.el.stream,\
-   org.apache.el.util
+org.apache.el.stream,\
+org.apache.el.util
 
 -includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
\ No newline at end of file
diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
index d1011d9..6349a7c 100644
--- a/res/bnd/tomcat-util.jar.tmp.bnd
+++ b/res/bnd/tomcat-util.jar.tmp.bnd
@@ -29,5 +29,5 @@ Export-Package: \
 org.apache.tomcat.util.threads
 
 -includepackage: \
-   org.apache.tomcat.util.json,\
-   org.apache.tomcat.util.threads.res
\ No newline at end of file
+org.apache.tomcat.util.json,\
+org.apache.tomcat.util.threads.res
\ No newline at end of file
diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd 
b/res/bnd/tomcat-websocket.jar.tmp.bnd
index 13f1423..f347dfc 100644
--- a/res/bnd/tomcat-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-websocket.jar.tmp.bnd
@@ -22,6 +22,6 @@ Export-Package: \
 org.apache.tomcat.websocket.server
 
 -includepackage: \
-   org.apache.tomcat.websocket.pojo
+org.apache.tomcat.websocket.pojo
 
 -includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
\ No newline at end of file


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] branch master updated: Tab police

[markt]

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 584fed1  Tab police
584fed1 is described below

commit 584fed1e20b9b8acb38231a14e06f5ed24f8bdcc
Author: Mark Thomas 
AuthorDate: Tue Jun 23 12:02:34 2020 +0100

Tab police

All Tomcat source should use spaces (typically 4) rather than tab
---
 res/bnd/jasper-el.jar.tmp.bnd  | 4 ++--
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 4 ++--
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 2 +-
 res/bnd/tomcat-util.jar.tmp.bnd| 4 ++--
 res/bnd/tomcat-websocket.jar.tmp.bnd   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/res/bnd/jasper-el.jar.tmp.bnd b/res/bnd/jasper-el.jar.tmp.bnd
index 45b2744..549215b 100644
--- a/res/bnd/jasper-el.jar.tmp.bnd
+++ b/res/bnd/jasper-el.jar.tmp.bnd
@@ -23,7 +23,7 @@ Export-Package: \
 org.apache.el.parser
 
 -includepackage: \
-   org.apache.el.stream,\
-   org.apache.el.util
+org.apache.el.stream,\
+org.apache.el.util
 
 -includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
\ No newline at end of file
diff --git a/res/bnd/tomcat-embed-el.jar.tmp.bnd 
b/res/bnd/tomcat-embed-el.jar.tmp.bnd
index cdd3a28..911ee04 100644
--- a/res/bnd/tomcat-embed-el.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-el.jar.tmp.bnd
@@ -25,8 +25,8 @@ Export-Package: \
 org.apache.el.parser
 
 -includepackage: \
-   org.apache.el.stream,\
-   org.apache.el.util
+org.apache.el.stream,\
+org.apache.el.util
 
 -includeresource.meta-inf: /META-INF/=../META-INF/jasper-el.jar/
 
diff --git a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd 
b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
index a47db3a..329d9c7 100644
--- a/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-embed-websocket.jar.tmp.bnd
@@ -24,7 +24,7 @@ Export-Package: \
 org.apache.tomcat.websocket.server
 
 -includepackage: \
-   org.apache.tomcat.websocket.pojo
+org.apache.tomcat.websocket.pojo
 
 -includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
 
diff --git a/res/bnd/tomcat-util.jar.tmp.bnd b/res/bnd/tomcat-util.jar.tmp.bnd
index d1011d9..6349a7c 100644
--- a/res/bnd/tomcat-util.jar.tmp.bnd
+++ b/res/bnd/tomcat-util.jar.tmp.bnd
@@ -29,5 +29,5 @@ Export-Package: \
 org.apache.tomcat.util.threads
 
 -includepackage: \
-   org.apache.tomcat.util.json,\
-   org.apache.tomcat.util.threads.res
\ No newline at end of file
+org.apache.tomcat.util.json,\
+org.apache.tomcat.util.threads.res
\ No newline at end of file
diff --git a/res/bnd/tomcat-websocket.jar.tmp.bnd 
b/res/bnd/tomcat-websocket.jar.tmp.bnd
index 13f1423..f347dfc 100644
--- a/res/bnd/tomcat-websocket.jar.tmp.bnd
+++ b/res/bnd/tomcat-websocket.jar.tmp.bnd
@@ -22,6 +22,6 @@ Export-Package: \
 org.apache.tomcat.websocket.server
 
 -includepackage: \
-   org.apache.tomcat.websocket.pojo
+org.apache.tomcat.websocket.pojo
 
 -includeresource.meta-inf: /META-INF/=../META-INF/tomcat-websocket.jar/
\ No newline at end of file


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Fix BZ 64540 - add specification specific metadata

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 12b0ce4e1c75fc1cb8a4f2bafbc9b5f467bdb390
Author: Raymond Augé 
AuthorDate: Fri Jun 19 11:52:40 2020 -0400

Fix BZ 64540 - add specification specific metadata

Signed-off-by: Raymond Augé 
---
 res/bnd/annotations-api.jar.tmp.bnd| 18 +++---
 res/bnd/el-api.jar.tmp.bnd | 16 -
 res/bnd/jaspic-api.jar.tmp.bnd | 19 +++
 res/bnd/jsp-api.jar.tmp.bnd| 19 +++
 res/bnd/servlet-api.jar.tmp.bnd| 24 +++
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 38 +++---
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 20 +---
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 19 +++
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 19 ---
 res/bnd/websocket-api.jar.tmp.bnd  | 17 +++--
 10 files changed, 171 insertions(+), 38 deletions(-)

diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index 9b2f84e..19db9f4 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -18,6 +18,18 @@
 Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
 Export-Package: \
-javax.annotation,\
-javax.annotation.security,\
-javax.annotation.sql
+javax.annotation.*;version=1.3
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaAnnotation;\
+version:List="1.3,1.2,1.1,1";\
+uses:='${packages;NAMED;javax.annotation.*}'
+
+-namesection: javax/annotation*/;\
+Implementation-Title=javax.annotation;\
+Implementation-Vendor='Apache Software Foundation';\
+Implementation-Version=1.3.${annotation.revision};\
+Specification-Title='Common Annotations';\
+Specification-Vendor='Oracle Corporation';\
+Specification-Version=1.3
\ No newline at end of file
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 1533ede..1c6481d 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -17,4 +17,18 @@
 
 Bundle-Name: tomcat-el-api
 Bundle-SymbolicName: org.apache.tomcat-el-api
-Export-Package: javax.el
+Export-Package: javax.el;version=3.0
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaEL;\
+version:List="3.0,2.2,2.1";\
+uses:='${packages;NAMED;javax.el.*}'
+
+-namesection: javax/el*/;\
+Specification-Title='Expression Language';\
+Specification-Version=3.0;\
+Specification-Vendor='Sun Microsystems, Inc.';\
+Implementation-Title=javax.el;\
+Implementation-Version=3.0.${el.revision};\
+Implementation-Vendor='Apache Software Foundation'
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index d911c38..aa964f7 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
 Bundle-Name: tomcat-jaspic-api
 Bundle-SymbolicName: org.apache.tomcat-jaspic-api
 Export-Package: \
-javax.security.auth.message,\
-javax.security.auth.message.callback,\
-javax.security.auth.message.config,\
-javax.security.auth.message.module
\ No newline at end of file
+javax.security.auth.message.*;version=1.1
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaJASPIC;\
+version:List="1.1,1";\
+uses:='${packages;NAMED;javax.security.auth.message.*}'
+
+-namesection: javax/security/auth/message*/;\
+Specification-Title='Java Authentication SPI for Containers';\
+Specification-Version=1.1;\
+Specification-Vendor='Sun Microsystems, Inc.';\
+Implementation-Title=javax.security.auth.message;\
+Implementation-Version=1.1.${jaspic.revision};\
+Implementation-Vendor='Apache Software Foundation'
\ No newline at end of file
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 0746375..f522c57 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
 Bundle-Name: tomcat-jsp-api
 Bundle-SymbolicName: org.apache.tomcat-jsp-api
 Export-Package: \
-javax.servlet.jsp,\
-javax.servlet.jsp.el,\
-javax.servlet.jsp.resources,\
-javax.servlet.jsp.tagext
\ No newline at end of file
+javax.servlet.jsp.*;version=2.3
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaJSP;\
+version:List="2.3,2.2,2.1,2";\
+uses:='${packages;NAMED;javax.servlet.jsp.*}'
+
+-namesection: javax/servlet/jsp*/;\
+Specification-Title='Java API for JavaServer Pages';\
+Specification-Version=2.3;\
+Specification-Vendor='Sun Microsystems, Inc.';\
+Implementation-Title=javax.servlet.jsp;\
+Implementation-Version=2.3.${jsp.revision};\
+Implementation-Vendor='Apache Software Foundation'
diff --git 

[tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd task, begin generating a better manifest and make sure the resulting jar contents are correct.

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit 393c022c87e5cbebf1b96c3e1e7aa3b2ab4d5b74
Author: Raymond Augé 
AuthorDate: Fri Jun 19 09:32:56 2020 -0400

Fix BZ 64540 - switch from bndwrap task to bnd task, begin generating a 
better manifest and make sure the resulting jar contents are correct.

Signed-off-by: Raymond Augé 
---
 build.xml | 17 ++---
 res/bnd/annotations-api.jar.tmp.bnd   |  2 +-
 res/bnd/build-defaults.bnd| 15 +++
 res/bnd/catalina-tribes.jar.tmp.bnd   |  5 -
 res/bnd/catalina.jar.tmp.bnd  |  5 -
 res/bnd/el-api.jar.tmp.bnd|  2 +-
 res/bnd/jasper-el.jar.tmp.bnd |  8 +++-
 res/bnd/jasper.jar.tmp.bnd|  7 ++-
 res/bnd/jaspic-api.jar.tmp.bnd|  2 +-
 res/bnd/jsp-api.jar.tmp.bnd   |  2 +-
 res/bnd/servlet-api.jar.tmp.bnd   |  2 +-
 res/bnd/{el-api.jar.tmp.bnd => spec-defaults.bnd} | 11 ++-
 res/bnd/tomcat-coyote.jar.tmp.bnd |  9 -
 res/bnd/tomcat-embed-core.jar.tmp.bnd | 15 ++-
 res/bnd/tomcat-embed-el.jar.tmp.bnd   |  8 +++-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd   |  7 ++-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd|  7 ++-
 res/bnd/tomcat-util.jar.tmp.bnd   |  6 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd  |  7 ++-
 res/bnd/websocket-api.jar.tmp.bnd |  2 +-
 webapps/docs/changelog.xml|  5 +
 21 files changed, 119 insertions(+), 25 deletions(-)

diff --git a/build.xml b/build.xml
index 1900b78..7dba702 100644
--- a/build.xml
+++ b/build.xml
@@ -3358,9 +3358,20 @@ Read the Building page on the Apache Tomcat 
documentation site for details on ho
 
   
 
-
-  
-
+
+
+
+  
+
+
+  
+  
+
+  
+
 
 
   
diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index 9399b6c..9b2f84e 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
 
 Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index 06e64c4..cdefb9c 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -14,3 +14,18 @@
 # limitations under the License.
 
 Bundle-Version: ${version_cleanup;${version}}
+
+Specification-Title: Apache Tomcat
+Specification-Version: ${version.major.minor}
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Apache Tomcat
+Implementation-Version: ${version}
+Implementation-Vendor: Apache Software Foundation
+
+X-Compile-Source-JDK: ${compile.source}
+X-Compile-Target-JDK: ${compile.target}
+
+-includeresource.notice: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
+-includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
+
+-noclassforname: true
\ No newline at end of file
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd 
b/res/bnd/catalina-tribes.jar.tmp.bnd
index 630169d..d6ae14a 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -28,4 +28,7 @@ Export-Package: \
 org.apache.catalina.tribes.transport,\
 org.apache.catalina.tribes.transport.bio,\
 org.apache.catalina.tribes.transport.nio,\
-org.apache.catalina.tribes.util
\ No newline at end of file
+org.apache.catalina.tribes.util
+
+-includepackage: \
+org.apache.catalina.tribes.membership.cloud
\ No newline at end of file
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 556169f..dc94c42 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -45,4 +45,7 @@ Export-Package: \
 org.apache.naming.java,\
 org.apache.catalina.webresources.war,\
 org.apache.catalina.manager.util,\
-org.apache.catalina
\ No newline at end of file
+org.apache.catalina
+
+-includepackage: \
+org.apache.naming.factory.webservices
\ No newline at end of file
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 70fdb91..1533ede 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
--include: build-defaults.bnd
+-include: build-defaults.bnd, 

[tomcat] branch master updated (fd431c2 -> c77cf50)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from fd431c2  Various improvements to code generation
 new 74e5876  Fix BZ 64540 - switch from bndwrap task to bnd task, begin 
generating a better manifest and make sure the resulting jar contents are 
correct.
 new c77cf50  Fix BZ 64540 - add specification specific metadata

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml  | 17 +--
 res/bnd/annotations-api.jar.tmp.bnd| 20 ++--
 res/bnd/build-defaults.bnd | 15 ++
 res/bnd/catalina-tribes.jar.tmp.bnd|  5 +-
 res/bnd/catalina.jar.tmp.bnd   |  5 +-
 res/bnd/el-api.jar.tmp.bnd | 18 +++-
 res/bnd/jasper-el.jar.tmp.bnd  |  8 +++-
 res/bnd/jasper.jar.tmp.bnd |  7 ++-
 res/bnd/jaspic-api.jar.tmp.bnd | 21 +++--
 res/bnd/jsp-api.jar.tmp.bnd| 21 +++--
 res/bnd/servlet-api.jar.tmp.bnd| 26 ---
 .../bnd/spec-defaults.bnd  |  7 ++-
 res/bnd/tomcat-coyote.jar.tmp.bnd  |  9 +++-
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 53 ++
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 24 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 26 +--
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 24 --
 res/bnd/tomcat-util.jar.tmp.bnd|  6 ++-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |  7 ++-
 res/bnd/websocket-api.jar.tmp.bnd  | 19 ++--
 webapps/docs/changelog.xml |  5 ++
 21 files changed, 287 insertions(+), 56 deletions(-)
 copy 
java/org/apache/catalina/authenticator/jaspic/LocalStrings_pt_BR.properties => 
res/bnd/spec-defaults.bnd (85%)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf merged pull request #305: Fix bz64540

[GitBox]

markt-asf merged pull request #305:
URL: https://github.com/apache/tomcat/pull/305


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[GitHub] [tomcat] markt-asf merged pull request #306: Fix bz64540 9.0.x

[GitBox]

markt-asf merged pull request #306:
URL: https://github.com/apache/tomcat/pull/306


   



This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[tomcat] 02/02: Fix BZ 64540 - add specification specific metadata

[markt]

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

commit c77cf5075691f3897cefcafb3b39bfb1a94b1d88
Author: Raymond Augé 
AuthorDate: Fri Jun 19 11:05:57 2020 -0400

Fix BZ 64540 - add specification specific metadata

Signed-off-by: Raymond Augé 
---
 res/bnd/annotations-api.jar.tmp.bnd| 18 +++---
 res/bnd/el-api.jar.tmp.bnd | 16 -
 res/bnd/jaspic-api.jar.tmp.bnd | 19 +++
 res/bnd/jsp-api.jar.tmp.bnd| 19 +++
 res/bnd/servlet-api.jar.tmp.bnd| 24 +++
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 38 +++---
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 16 -
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 19 +++
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 17 +++--
 res/bnd/websocket-api.jar.tmp.bnd  | 17 +++--
 10 files changed, 168 insertions(+), 35 deletions(-)

diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index b2ed4d3..a2f00ce 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -18,6 +18,18 @@
 Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
 Export-Package: \
-jakarta.annotation,\
-jakarta.annotation.security,\
-jakarta.annotation.sql
\ No newline at end of file
+jakarta.annotation.*;version=${annotation.spec.version}
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaAnnotation;\
+version:Version=${annotation.spec.version};\
+uses:='${packages;NAMED;jakarta.annotation.*}'
+
+-namesection: jakarta/annotation*/;\
+Specification-Title=Jakarta Annotations;\
+Specification-Version=${annotation.spec.version};\
+Specification-Vendor=Eclipse Foundation;\
+Implementation-Title=jakarta.annotation;\
+Implementation-Version=${annotation.spec.version}.${annotation.revision};\
+Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index cfb2da3..087d98b 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -17,4 +17,18 @@
 
 Bundle-Name: tomcat-el-api
 Bundle-SymbolicName: org.apache.tomcat-el-api
-Export-Package: jakarta.el
\ No newline at end of file
+Export-Package: jakarta.el;version=${el.spec.version}
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaEL;\
+version:Version=${el.spec.version};\
+uses:='${packages;NAMED;jakarta.el.*}'
+
+-namesection: jakarta/el*/;\
+Specification-Title=Jakarta Expression Language;\
+Specification-Version=${el.spec.version};\
+Specification-Vendor=Eclipse Foundation;\
+Implementation-Title=jakarta.el;\
+Implementation-Version=${el.spec.version}.${el.revision};\
+Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index d82d334..986299d 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
 Bundle-Name: tomcat-jaspic-api
 Bundle-SymbolicName: org.apache.tomcat-jaspic-api
 Export-Package: \
-jakarta.security.auth.message,\
-jakarta.security.auth.message.callback,\
-jakarta.security.auth.message.config,\
-jakarta.security.auth.message.module
\ No newline at end of file
+jakarta.security.auth.message.*;version=${jaspic.spec.version}
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaJASPIC;\
+version:Version=${jaspic.spec.version};\
+uses:='${packages;NAMED;jakarta.security.auth.message.*}'
+
+-namesection: jakarta/security/auth/message*/;\
+Specification-Title=Jakarta Authentication SPI for Containers;\
+Specification-Version=${jaspic.spec.version};\
+Specification-Vendor=Eclipse Foundation;\
+Implementation-Title=jakarta.security.auth.message;\
+Implementation-Version=${jaspic.spec.version}.${jaspic.revision};\
+Implementation-Vendor=Apache Software Foundation
\ No newline at end of file
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index 882107e..a9c95d7 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -18,7 +18,18 @@
 Bundle-Name: tomcat-jsp-api
 Bundle-SymbolicName: org.apache.tomcat-jsp-api
 Export-Package: \
-jakarta.servlet.jsp,\
-jakarta.servlet.jsp.el,\
-jakarta.servlet.jsp.resources,\
-jakarta.servlet.jsp.tagext
\ No newline at end of file
+jakarta.servlet.jsp.*;version=${jsp.spec.version}
+
+Provide-Capability: \
+osgi.contract;\
+osgi.contract=JavaJSP;\
+version:Version=${jsp.spec.version};\
+uses:='${packages;NAMED;jakarta.servlet.jsp.*}'
+

[tomcat] 01/02: Fix BZ 64540 - switch from bndwrap task to bnd task, begin generating a better manifest and make sure the resulting jar contents are correct.

[markt]

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

commit 74e58767a7b1798dd43b519f7d576fda2803
Author: Raymond Augé 
AuthorDate: Fri Jun 19 09:32:56 2020 -0400

Fix BZ 64540 - switch from bndwrap task to bnd task, begin generating a 
better manifest and make sure the resulting jar contents are correct.

Signed-off-by: Raymond Augé 
---
 build.xml | 17 ++---
 res/bnd/annotations-api.jar.tmp.bnd   |  4 ++--
 res/bnd/build-defaults.bnd| 15 +++
 res/bnd/catalina-tribes.jar.tmp.bnd   |  5 -
 res/bnd/catalina.jar.tmp.bnd  |  5 -
 res/bnd/el-api.jar.tmp.bnd|  2 +-
 res/bnd/jasper-el.jar.tmp.bnd |  8 +++-
 res/bnd/jasper.jar.tmp.bnd|  7 ++-
 res/bnd/jaspic-api.jar.tmp.bnd|  2 +-
 res/bnd/jsp-api.jar.tmp.bnd   |  2 +-
 res/bnd/servlet-api.jar.tmp.bnd   |  2 +-
 res/bnd/{el-api.jar.tmp.bnd => spec-defaults.bnd} | 11 ++-
 res/bnd/tomcat-coyote.jar.tmp.bnd |  9 -
 res/bnd/tomcat-embed-core.jar.tmp.bnd | 15 ++-
 res/bnd/tomcat-embed-el.jar.tmp.bnd   |  8 +++-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd   |  7 ++-
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd|  7 ++-
 res/bnd/tomcat-util.jar.tmp.bnd   |  6 +-
 res/bnd/tomcat-websocket.jar.tmp.bnd  |  7 ++-
 res/bnd/websocket-api.jar.tmp.bnd |  2 +-
 webapps/docs/changelog.xml|  5 +
 21 files changed, 120 insertions(+), 26 deletions(-)

diff --git a/build.xml b/build.xml
index 05ebace..2482dcd 100644
--- a/build.xml
+++ b/build.xml
@@ -3375,9 +3375,20 @@ Read the Building page on the Apache Tomcat 
documentation site for details on ho
 
   
 
-
-  
-
+
+
+
+  
+
+
+  
+  
+
+  
+
 
 
   
diff --git a/res/bnd/annotations-api.jar.tmp.bnd 
b/res/bnd/annotations-api.jar.tmp.bnd
index 7c13124..b2ed4d3 100644
--- a/res/bnd/annotations-api.jar.tmp.bnd
+++ b/res/bnd/annotations-api.jar.tmp.bnd
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
--include: build-defaults.bnd
+-include: build-defaults.bnd, spec-defaults.bnd
 
 Bundle-Name: tomcat-annotations-api
 Bundle-SymbolicName: org.apache.tomcat-annotations-api
 Export-Package: \
 jakarta.annotation,\
 jakarta.annotation.security,\
-jakarta.annotation.sql
+jakarta.annotation.sql
\ No newline at end of file
diff --git a/res/bnd/build-defaults.bnd b/res/bnd/build-defaults.bnd
index 06e64c4..cdefb9c 100644
--- a/res/bnd/build-defaults.bnd
+++ b/res/bnd/build-defaults.bnd
@@ -14,3 +14,18 @@
 # limitations under the License.
 
 Bundle-Version: ${version_cleanup;${version}}
+
+Specification-Title: Apache Tomcat
+Specification-Version: ${version.major.minor}
+Specification-Vendor: Apache Software Foundation
+Implementation-Title: Apache Tomcat
+Implementation-Version: ${version}
+Implementation-Vendor: Apache Software Foundation
+
+X-Compile-Source-JDK: ${compile.source}
+X-Compile-Target-JDK: ${compile.target}
+
+-includeresource.notice: 
META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n"
+-includeresource.license: {META-INF/LICENSE=../META-INF/default.license}
+
+-noclassforname: true
\ No newline at end of file
diff --git a/res/bnd/catalina-tribes.jar.tmp.bnd 
b/res/bnd/catalina-tribes.jar.tmp.bnd
index 630169d..d6ae14a 100644
--- a/res/bnd/catalina-tribes.jar.tmp.bnd
+++ b/res/bnd/catalina-tribes.jar.tmp.bnd
@@ -28,4 +28,7 @@ Export-Package: \
 org.apache.catalina.tribes.transport,\
 org.apache.catalina.tribes.transport.bio,\
 org.apache.catalina.tribes.transport.nio,\
-org.apache.catalina.tribes.util
\ No newline at end of file
+org.apache.catalina.tribes.util
+
+-includepackage: \
+org.apache.catalina.tribes.membership.cloud
\ No newline at end of file
diff --git a/res/bnd/catalina.jar.tmp.bnd b/res/bnd/catalina.jar.tmp.bnd
index 556169f..dc94c42 100644
--- a/res/bnd/catalina.jar.tmp.bnd
+++ b/res/bnd/catalina.jar.tmp.bnd
@@ -45,4 +45,7 @@ Export-Package: \
 org.apache.naming.java,\
 org.apache.catalina.webresources.war,\
 org.apache.catalina.manager.util,\
-org.apache.catalina
\ No newline at end of file
+org.apache.catalina
+
+-includepackage: \
+org.apache.naming.factory.webservices
\ No newline at end of file
diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 18cc1bc..cfb2da3 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -13,7 +13,7 @@
 # See the 

[tomcat] branch 9.0.x updated (986e457 -> 12b0ce4)

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a change to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git.


from 986e457  Fix BZ 64532 - update to bnd 5.1.1
 new 393c022  Fix BZ 64540 - switch from bndwrap task to bnd task, begin 
generating a better manifest and make sure the resulting jar contents are 
correct.
 new 12b0ce4  Fix BZ 64540 - add specification specific metadata

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml  | 17 +--
 res/bnd/annotations-api.jar.tmp.bnd| 20 ++--
 res/bnd/build-defaults.bnd | 15 ++
 res/bnd/catalina-tribes.jar.tmp.bnd|  5 +-
 res/bnd/catalina.jar.tmp.bnd   |  5 +-
 res/bnd/el-api.jar.tmp.bnd | 18 +++-
 res/bnd/jasper-el.jar.tmp.bnd  |  8 +++-
 res/bnd/jasper.jar.tmp.bnd |  7 ++-
 res/bnd/jaspic-api.jar.tmp.bnd | 21 +++--
 res/bnd/jsp-api.jar.tmp.bnd| 21 +++--
 res/bnd/servlet-api.jar.tmp.bnd| 26 ---
 .../bnd/spec-defaults.bnd  |  7 ++-
 res/bnd/tomcat-coyote.jar.tmp.bnd  |  9 +++-
 res/bnd/tomcat-embed-core.jar.tmp.bnd  | 53 ++
 res/bnd/tomcat-embed-el.jar.tmp.bnd| 24 +-
 res/bnd/tomcat-embed-jasper.jar.tmp.bnd| 26 +--
 res/bnd/tomcat-embed-websocket.jar.tmp.bnd | 24 --
 res/bnd/tomcat-util.jar.tmp.bnd|  6 ++-
 res/bnd/tomcat-websocket.jar.tmp.bnd   |  7 ++-
 res/bnd/websocket-api.jar.tmp.bnd  | 19 ++--
 webapps/docs/changelog.xml |  5 ++
 21 files changed, 287 insertions(+), 56 deletions(-)
 copy java/org/apache/catalina/connector/LocalStrings_pt_BR.properties => 
res/bnd/spec-defaults.bnd (85%)


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Bug 64540] switch from bndwrap task to bnd task

[bugzilla]

https://bz.apache.org/bugzilla/show_bug.cgi?id=64540

Mark Thomas  changed:

   What|Removed |Added

 Resolution|--- |FIXED
 Status|NEW |RESOLVED

--- Comment #3 from Mark Thomas  ---
Fixed in:
- master for 10.0.0-M7 onwards
- 9.0.x for 9.0.37 onwards

Thanks for the PRs.

-- 
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 master updated: Various improvements to code generation

[remm]

This is an automated email from the ASF dual-hosted git repository.

remm 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 fd431c2  Various improvements to code generation
fd431c2 is described below

commit fd431c2f18cd1c04bc2902400fe3344fa58a656f
Author: remm 
AuthorDate: Tue Jun 23 12:02:48 2020 +0200

Various improvements to code generation

Add a configuration for the location of the generated sources.
Catalina start and stop will now use the same code. As a result, stop
will now use the configuration source and will also generate stop code.
If the use generated flag is enabled, ContextConfig will not look at the
real files at all, this is just simpler (and there could be 100s of
webapps too).
Pass arguments from Tomcat to Catalina, since in addition to educational
uses, the feature would be useful with AOT compilation.
---
 java/org/apache/catalina/startup/Catalina.java | 177 +
 .../catalina/startup/ConnectorCreateRule.java  |   1 +
 .../org/apache/catalina/startup/ContextConfig.java |  39 +++--
 .../catalina/startup/LocalStrings.properties   |   3 +-
 java/org/apache/catalina/startup/Tomcat.java   |  39 -
 .../tomcat/util/digester/ObjectCreateRule.java |   1 +
 .../tomcat/util/digester/SetPropertiesRule.java|   3 -
 webapps/docs/changelog.xml |   4 +
 8 files changed, 182 insertions(+), 85 deletions(-)

diff --git a/java/org/apache/catalina/startup/Catalina.java 
b/java/org/apache/catalina/startup/Catalina.java
index 272d428..5280d32 100644
--- a/java/org/apache/catalina/startup/Catalina.java
+++ b/java/org/apache/catalina/startup/Catalina.java
@@ -18,7 +18,6 @@ package org.apache.catalina.startup;
 
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -148,6 +147,18 @@ public class Catalina {
 
 
 /**
+ * Location of generated sources.
+ */
+protected File generatedCodeLocation = null;
+
+
+/**
+ * Value of the argument.
+ */
+protected String generatedCodeLocationParameter = null;
+
+
+/**
  * Use generated code as a replacement for configuration files.
  */
 protected boolean useGeneratedCode = false;
@@ -203,6 +214,16 @@ public class Catalina {
 }
 
 
+public File getGeneratedCodeLocation() {
+return this.generatedCodeLocation;
+}
+
+
+public void setGeneratedCodeLocation(File generatedCodeLocation) {
+this.generatedCodeLocation = generatedCodeLocation;
+}
+
+
 /**
  * @return true if an exception should be thrown if an error
  * occurs during server init
@@ -284,6 +305,7 @@ public class Catalina {
 protected boolean arguments(String args[]) {
 
 boolean isConfig = false;
+boolean isGenerateCode = false;
 
 if (args.length < 1) {
 usage();
@@ -297,20 +319,29 @@ public class Catalina {
 } else if (arg.equals("-config")) {
 isConfig = true;
 } else if (arg.equals("-generateCode")) {
-generateCode = true;
+setGenerateCode(true);
+isGenerateCode = true;
 } else if (arg.equals("-useGeneratedCode")) {
-useGeneratedCode = true;
+setUseGeneratedCode(true);
+isGenerateCode = false;
 } else if (arg.equals("-nonaming")) {
 setUseNaming(false);
+isGenerateCode = false;
 } else if (arg.equals("-help")) {
 usage();
 return false;
 } else if (arg.equals("start")) {
+isGenerateCode = false;
 // NOOP
 } else if (arg.equals("configtest")) {
+isGenerateCode = false;
 // NOOP
 } else if (arg.equals("stop")) {
+isGenerateCode = false;
 // NOOP
+} else if (isGenerateCode) {
+generatedCodeLocationParameter = arg;
+isGenerateCode = false;
 } else {
 usage();
 return false;
@@ -527,6 +558,72 @@ public class Catalina {
 }
 
 
+protected void parseServerXml(boolean start) {
+// Set configuration source
+ConfigFileLoader.setSource(new 
CatalinaBaseConfigurationSource(Bootstrap.getCatalinaBaseFile(), 
getConfigFile()));
+File file = configFile();
+
+// Init source location
+File serverXmlLocation = null;
+if (generateCode) {
+if (generatedCodeLocationParameter != null) {
+generatedCodeLocation = new 
File(generatedCodeLocationParameter);
+if (!generatedCodeLocation.isAbsolute()) {
+

Re: JDK 15 is in Rampdown Phase One

[Rory O'Donnell]

Thanks again Martin!

On 23/06/2020 06:47, Martin Grigorov wrote:

Hi Rory,

I've built Tomcat 9.0.x and ran its tests with JDK 15 b28 on both 
x86_64 and aarch64.

No issues found!

Regards,
Martin

On Mon, Jun 22, 2020 at 7:25 PM Rory O'Donnell 
mailto:rory.odonn...@oracle.com>> wrote:



Hi Mark,

*Per the JDK 15 schedule , we are in Rampdown Phase One* *[1] *

*Please advise if you find any issues while testing the latest
Early Access builds.
*

  * Schedule for JDK 15
  o *2020/06/11 Rampdown Phase One*
  o 2020/07/16 Rampdown Phase Two
  o 2020/08/06 Initial Release Candidate
  o 2020/08/20 Final Release Candidate
  o 2020/09/15 General Availability

  * Features included in JDK 15:
  o JEP 339: Edwards-Curve Digital Signature Algorithm (EdDSA)

  o JEP 360: Sealed Classes (Preview)

  o JEP 371: Hidden Classes 
  o JEP 372: Remove the Nashorn JavaScript Engine

  o JEP 373: Reimplement the Legacy DatagramSocket API

  o JEP 374: Disable and Deprecate Biased Locking

  o JEP 375: Pattern Matching for instanceof (Second Preview)

  o JEP 377: ZGC: A Scalable Low-Latency Garbage Collector

  o JEP 378: Text Blocks 
  o JEP 379: Shenandoah: A Low-Pause-Time Garbage Collector

  o JEP 381: Remove the Solaris and SPARC Ports

  o JEP 383: Foreign-Memory Access API (Second Incubator)

  o JEP 384: Records (Second Preview)

  o JEP 385: Deprecate RMI Activation for Removal


*JDK 15 **Early Access build 28 **is available**at : -
jdk.java.net/15/ *

These early-access, open-source builds are provided under the GNU
General Public License, version 2, with the Classpath
Exception**Release notes

  * Release notes
  o http://jdk.java.net/15/release-notes
  * Recent fixes that might be of interest
  o Build 27
  + JDK-8233215: jpackage doesn't allow enough flexibility
for file type binding
  + JDK-8244582: Remove terminally deprecated
Solaris-specific SO_FLOW_SLA socket option
  + JDK-8245068: Implement Deprecation of RMI Activation
  + JDK-8246770: Atomic::add() with 64 bit value fails to
link on 32-bit platforms
  # Reported by JaCoCo
  o Build 26
  + JDK-8240871: SSLEngine handshake status immediately
after the handshake can be NOT_HANDSHAKING rather than
FINISHED with TLSv1.3
  # Reported by Apache Tomcat
  o Build 25
  + JDK-8206925: Support the certificate_authorities extension
  + JDK-8239480: Support for CLDR version 37
  + JDK-8243925: Toolkit#getScreenInsets() returns wrong
value on HiDPI screens (Windows)

*JDK 16 Early Access build 2 is available**at : -
jdk.java.net/16/ *

These early-access, open-source builds are provided under the GNU
General Public License, version 2, with the Classpath Exception.*
*

*_Survey on _**_jinfo, jmap, jstack serviceability tools in JDK:_ *

  * Oracle is considering deprecation and (eventual) removal of 3
JDK tools - jinfo, jmap, jstack.
  * The Survey Link

will remain open through July 15 2020.


Rgds, Rory

[1]
https://mail.openjdk.java.net/pipermail/jdk-dev/2020-June/004401.html

-- 
Rgds, Rory O'Donnell

Quality Engineering Manager
Oracle EMEA, Dublin, Ireland


--
Rgds, Rory O'Donnell
Quality Engineering Manager
Oracle EMEA, Dublin, Ireland