[tomcat] 01/05: Align JPMS module names with current jakarta expectations

[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 60bbe490ceec812022425070d2e52f389f606c40
Author: Mark Thomas 
AuthorDate: Fri Nov 6 11:53:55 2020 +

Align JPMS module names with current jakarta expectations
---
 res/bnd/el-api.jar.tmp.bnd| 4 ++--
 res/bnd/jaspic-api.jar.tmp.bnd| 4 ++--
 res/bnd/jsp-api.jar.tmp.bnd   | 4 ++--
 res/bnd/servlet-api.jar.tmp.bnd   | 4 ++--
 res/bnd/websocket-api.jar.tmp.bnd | 4 ++--
 webapps/docs/changelog.xml| 3 +++
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index d81d961..c1c7500 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -34,9 +34,9 @@ Provide-Capability: \
 Implementation-Vendor='Apache Software Foundation'
 
 -jpms-module-info: \
-javax.el.api;\
+java.el;\
 access=32;\
 version=${el.spec.version}
 -jpms-module-info-options: \
-javax.el.api;\
+java.el;\
 substitute=el-api
diff --git a/res/bnd/jaspic-api.jar.tmp.bnd b/res/bnd/jaspic-api.jar.tmp.bnd
index e7c44db..ad74c64 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
 Implementation-Vendor='Apache Software Foundation'
 
 -jpms-module-info: \
-javax.security.enterprise.api;\
+java.security.auth.message;\
 access=32;\
 version=${jaspic.spec.version}
 -jpms-module-info-options: \
-javax.security.enterprise.api;\
+java.security.auth.message;\
 substitute=jaspic-api
diff --git a/res/bnd/jsp-api.jar.tmp.bnd b/res/bnd/jsp-api.jar.tmp.bnd
index e011d76..5d29488 100644
--- a/res/bnd/jsp-api.jar.tmp.bnd
+++ b/res/bnd/jsp-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
 Implementation-Vendor='Apache Software Foundation'
 
 -jpms-module-info: \
-javax.servlet.jsp.api;\
+java.servlet.jsp;\
 access=32;\
 version=${jsp.spec.version}
 -jpms-module-info-options: \
-javax.servlet.jsp.api;\
+java.servlet.jsp;\
 substitute=jsp-api
diff --git a/res/bnd/servlet-api.jar.tmp.bnd b/res/bnd/servlet-api.jar.tmp.bnd
index 8fd76bd..ace3872 100644
--- a/res/bnd/servlet-api.jar.tmp.bnd
+++ b/res/bnd/servlet-api.jar.tmp.bnd
@@ -39,9 +39,9 @@ Provide-Capability: \
 Implementation-Vendor='Apache Software Foundation'
 
 -jpms-module-info: \
-javax.servlet.api;\
+java.servlet;\
 access=32;\
 version=${servlet.spec.version}
 -jpms-module-info-options: \
-javax.servlet.api;\
+java.servlet;\
 substitute=servlet-api
diff --git a/res/bnd/websocket-api.jar.tmp.bnd 
b/res/bnd/websocket-api.jar.tmp.bnd
index ccf9942..2001349 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
 Implementation-Vendor='Apache Software Foundation'
 
 -jpms-module-info: \
-javax.websocket.api;\
+java.websocket;\
 access=32;\
 version=${websocket.spec.version}
 -jpms-module-info-options: \
-javax.websocket.api;\
+java.websocket;\
 substitute=websocket-api
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 69a36d7..418679c 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -177,6 +177,9 @@
   
 Improvements to Russian translations. Provided by Azat. (markt)
   
+  
+Align JPMS module names with current Jakarta EE expectations. (markt)
+  
 
   
 


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

[tomcat] 01/04: Align JPMS module names with current jakarta expectations

[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 1a338aa178b2d03b2296c15f446d9f7f21e240e3
Author: Mark Thomas 
AuthorDate: Mon Nov 2 19:17:45 2020 +

Align JPMS module names with current jakarta expectations
---
 res/bnd/el-api.jar.tmp.bnd| 4 ++--
 res/bnd/jaspic-api.jar.tmp.bnd| 4 ++--
 res/bnd/websocket-api.jar.tmp.bnd | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/res/bnd/el-api.jar.tmp.bnd b/res/bnd/el-api.jar.tmp.bnd
index 383a2c1..ec61955 100644
--- a/res/bnd/el-api.jar.tmp.bnd
+++ b/res/bnd/el-api.jar.tmp.bnd
@@ -34,9 +34,9 @@ Provide-Capability: \
 Implementation-Vendor=Apache Software Foundation
 
 -jpms-module-info: \
-jakarta.el.api;\
+jakarta.el;\
 access=32;\
 version=${el.spec.version}
 -jpms-module-info-options: \
-jakarta.el.api;\
+jakarta.el;\
 substitute=el-api
\ 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 29845a1..7cf0565 100644
--- a/res/bnd/jaspic-api.jar.tmp.bnd
+++ b/res/bnd/jaspic-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
 Implementation-Vendor=Apache Software Foundation
 
 -jpms-module-info: \
-jakarta.security.enterprise;\
+jakarta.security.auth.message;\
 access=32;\
 version=${jaspic.spec.version}
 -jpms-module-info-options: \
-jakarta.security.enterprise;\
+jakarta.security.auth.message;\
 substitute=jaspic-api
\ No newline at end of file
diff --git a/res/bnd/websocket-api.jar.tmp.bnd 
b/res/bnd/websocket-api.jar.tmp.bnd
index 42bb888..93c9fe3 100644
--- a/res/bnd/websocket-api.jar.tmp.bnd
+++ b/res/bnd/websocket-api.jar.tmp.bnd
@@ -35,9 +35,9 @@ Provide-Capability: \
 Implementation-Vendor=Apache Software Foundation
 
 -jpms-module-info: \
-jakarta.websocket.api;\
+jakarta.websocket;\
 access=32;\
 version=${websocket.spec.version}
 -jpms-module-info-options: \
-jakarta.websocket.api;\
+jakarta.websocket;\
 substitute=websocket-api
\ 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

Re: JPMS module names

[Igal Sapir]

Mark,

On Thu, Oct 29, 2020 at 12:43 PM Mark Thomas  wrote:

> Hi all,
>
> Just a reminder that this is on the radar. I'll likely be looking to
> make these changes early next week as part of the prep for the next
> release round (I need to sort this to be able to fix BZ 64849 sensibly).
>
> Mark
>
>
> On 27/10/2020 20:04, Mark Thomas wrote:
> > Hi all,
> >
> > We are starting to get JPMS related bug reports. Resolving the issues is
> > technically simple but depends on us deciding on the names to use for
> > the various modules.
> >
> > The names we choose for our own modules are easy. Generally we are using
> > the same or derivation from the OSGi module name.
> >
> > The names we use for the spec API modules are a little more tricky. We
> > need to (try and) remain aligned with the RI spec JARs.
> >
> > It looks like Jakarta EE 9 onwards is going to have consistent naming
> > (at least it does for the modules we use). Java EE 8 / Jakarta EE 8 is a
> > bit more inconsistent.
> >
> > I have put together a wiki page that documents the current position and
> > the naming I propose we use in Tomcat.
> >
> > https://cwiki.apache.org/confluence/display/TOMCAT/JPMS+names
> >
> > Comments (in this thread ideally) welcome.
>

+1.  Your proposal looks good.

Best,

Igal



> >
> > Once we (appear to) have consensus I'll update the builds to use the new
> > names and start fixing the associated bugs.
> >
> > Mark
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
>
>
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
>
>

Re: JPMS module names

[Mark Thomas]

Hi all,

Just a reminder that this is on the radar. I'll likely be looking to
make these changes early next week as part of the prep for the next
release round (I need to sort this to be able to fix BZ 64849 sensibly).

Mark


On 27/10/2020 20:04, Mark Thomas wrote:
> Hi all,
> 
> We are starting to get JPMS related bug reports. Resolving the issues is
> technically simple but depends on us deciding on the names to use for
> the various modules.
> 
> The names we choose for our own modules are easy. Generally we are using
> the same or derivation from the OSGi module name.
> 
> The names we use for the spec API modules are a little more tricky. We
> need to (try and) remain aligned with the RI spec JARs.
> 
> It looks like Jakarta EE 9 onwards is going to have consistent naming
> (at least it does for the modules we use). Java EE 8 / Jakarta EE 8 is a
> bit more inconsistent.
> 
> I have put together a wiki page that documents the current position and
> the naming I propose we use in Tomcat.
> 
> https://cwiki.apache.org/confluence/display/TOMCAT/JPMS+names
> 
> Comments (in this thread ideally) welcome.
> 
> Once we (appear to) have consensus I'll update the builds to use the new
> names and start fixing the associated bugs.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 


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

JPMS module names

[Mark Thomas]

Hi all,

We are starting to get JPMS related bug reports. Resolving the issues is
technically simple but depends on us deciding on the names to use for
the various modules.

The names we choose for our own modules are easy. Generally we are using
the same or derivation from the OSGi module name.

The names we use for the spec API modules are a little more tricky. We
need to (try and) remain aligned with the RI spec JARs.

It looks like Jakarta EE 9 onwards is going to have consistent naming
(at least it does for the modules we use). Java EE 8 / Jakarta EE 8 is a
bit more inconsistent.

I have put together a wiki page that documents the current position and
the naming I propose we use in Tomcat.

https://cwiki.apache.org/confluence/display/TOMCAT/JPMS+names

Comments (in this thread ideally) welcome.

Once we (appear to) have consensus I'll update the builds to use the new
names and start fixing the associated bugs.

Mark

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

Re: JPMS module names

[Mark Thomas]

On 16/06/2020 15:52, Raymond Auge wrote:
> 
> 
> On Tue, Jun 16, 2020 at 10:43 AM Mark Thomas  > wrote:
> 
> On 16/06/2020 15:00, Raymond Auge wrote:
> > Hey folks,
> >
> > I've extrapolated what I found as basis for a rule to create module
> > names and this is what I've come up with:
> >
> > module.name  :
> org.apache.${replace;${Bundle-Name};-;.}
> >
> > that is:
> > - take the `Bundle-Name` value (which appears to have a consistent
> format)
> > - replace dashes with dots
> > - prefix with "org.apache."
> >
> > The result is:
> >
> > org.apache.tomcat.api
> > org.apache.tomcat.catalina
> > org.apache.tomcat.catalina.ant
> > org.apache.tomcat.catalina.ha
> > org.apache.tomcat.coyote
> > org.apache.tomcat.dbcp
> > org.apache.tomcat.jasper
> > org.apache.tomcat.jasper.el
> > org.apache.tomcat.jni
> > org.apache.tomcat.juli
> > org.apache.tomcat.ssi
> > org.apache.tomcat.storeconfig
> > org.apache.tomcat.tribes
> > org.apache.tomcat.util
> > org.apache.tomcat.util.scan
> > org.apache.tomcat.websocket
> 
> 
> Are we at least fine with the tomcat module names? (notice I did miss
> tomcat-jdbc which has a special build that I still need to work on).

They look OK to me.

> > For the spec API I've used the official names pulled from each
> spec project:
> >
> > jakarta.annotation
> > jakarta.el.api
> > jakarta.security.enterprise
> > jakarta.servlet
> > jakarta.servlet.jsp
> > jakarta.websocket.api
> >
> > Does that look correct?
> 
> A couple of the spec ones look inconsistent. The naming guidance for
> Jakarta is:
> https://wiki.eclipse.org/JakartaEE_Maven_Versioning_Rules
> 
> I don't think the Jakarta PMC has made a final decision on JMPS rules or
> even if a JPMS name is required. I have proposed that as a general rule
> each project uses the OSGi Bundle-SymbolicName with any "-" characters
> replaced by "." as the JPMS module name.
> 
> I'd expect at least JSP and servlet to switch to that format by the time
> of the Jakarta EE 9 release.
> 
> 
> I will adjust and follow your proposal for the time being then.

OK. I guess explicitly stating something and being "wrong" is no worse
than one being implied from the file name and being "wrong".

I'll see what I can do to get clearer guidance from the Jakarta EE PMC.

Mark

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

Re: JPMS module names

[Raymond Auge]

On Tue, Jun 16, 2020 at 10:43 AM Mark Thomas  wrote:

> On 16/06/2020 15:00, Raymond Auge wrote:
> > Hey folks,
> >
> > I've extrapolated what I found as basis for a rule to create module
> > names and this is what I've come up with:
> >
> > module.name :
> org.apache.${replace;${Bundle-Name};-;.}
> >
> > that is:
> > - take the `Bundle-Name` value (which appears to have a consistent
> format)
> > - replace dashes with dots
> > - prefix with "org.apache."
> >
> > The result is:
> >
> > org.apache.tomcat.api
> > org.apache.tomcat.catalina
> > org.apache.tomcat.catalina.ant
> > org.apache.tomcat.catalina.ha
> > org.apache.tomcat.coyote
> > org.apache.tomcat.dbcp
> > org.apache.tomcat.jasper
> > org.apache.tomcat.jasper.el
> > org.apache.tomcat.jni
> > org.apache.tomcat.juli
> > org.apache.tomcat.ssi
> > org.apache.tomcat.storeconfig
> > org.apache.tomcat.tribes
> > org.apache.tomcat.util
> > org.apache.tomcat.util.scan
> > org.apache.tomcat.websocket
>

Are we at least fine with the tomcat module names? (notice I did miss
tomcat-jdbc which has a special build that I still need to work on).


> >
> > For the spec API I've used the official names pulled from each spec
> project:
> >
> > jakarta.annotation
> > jakarta.el.api
> > jakarta.security.enterprise
> > jakarta.servlet
> > jakarta.servlet.jsp
> > jakarta.websocket.api
> >
> > Does that look correct?
>
> A couple of the spec ones look inconsistent. The naming guidance for
> Jakarta is:
> https://wiki.eclipse.org/JakartaEE_Maven_Versioning_Rules
>
> I don't think the Jakarta PMC has made a final decision on JMPS rules or
> even if a JPMS name is required. I have proposed that as a general rule
> each project uses the OSGi Bundle-SymbolicName with any "-" characters
> replaced by "." as the JPMS module name.
>
> I'd expect at least JSP and servlet to switch to that format by the time
> of the Jakarta EE 9 release.
>

I will adjust and follow your proposal for the time being then.

- Ray


>
> JPMS name feels like a bit of a moving target at this point.
>
> 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)

Re: JPMS module names

[Mark Thomas]

On 16/06/2020 15:00, Raymond Auge wrote:
> Hey folks,
> 
> I've extrapolated what I found as basis for a rule to create module
> names and this is what I've come up with:
> 
> module.name : org.apache.${replace;${Bundle-Name};-;.}
> 
> that is:
> - take the `Bundle-Name` value (which appears to have a consistent format)
> - replace dashes with dots
> - prefix with "org.apache."
> 
> The result is:
> 
> org.apache.tomcat.api
> org.apache.tomcat.catalina
> org.apache.tomcat.catalina.ant
> org.apache.tomcat.catalina.ha
> org.apache.tomcat.coyote
> org.apache.tomcat.dbcp
> org.apache.tomcat.jasper
> org.apache.tomcat.jasper.el
> org.apache.tomcat.jni
> org.apache.tomcat.juli
> org.apache.tomcat.ssi
> org.apache.tomcat.storeconfig
> org.apache.tomcat.tribes
> org.apache.tomcat.util
> org.apache.tomcat.util.scan
> org.apache.tomcat.websocket
> 
> For the spec API I've used the official names pulled from each spec project:
> 
> jakarta.annotation
> jakarta.el.api
> jakarta.security.enterprise
> jakarta.servlet
> jakarta.servlet.jsp
> jakarta.websocket.api
> 
> Does that look correct?

A couple of the spec ones look inconsistent. The naming guidance for
Jakarta is:
https://wiki.eclipse.org/JakartaEE_Maven_Versioning_Rules

I don't think the Jakarta PMC has made a final decision on JMPS rules or
even if a JPMS name is required. I have proposed that as a general rule
each project uses the OSGi Bundle-SymbolicName with any "-" characters
replaced by "." as the JPMS module name.

I'd expect at least JSP and servlet to switch to that format by the time
of the Jakarta EE 9 release.

JPMS name feels like a bit of a moving target at this point.

Mark

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

JPMS module names

[Raymond Auge]

Hey folks,

I've extrapolated what I found as basis for a rule to create module names
and this is what I've come up with:

module.name: org.apache.${replace;${Bundle-Name};-;.}

that is:
- take the `Bundle-Name` value (which appears to have a consistent format)
- replace dashes with dots
- prefix with "org.apache."

The result is:

org.apache.tomcat.api
org.apache.tomcat.catalina
org.apache.tomcat.catalina.ant
org.apache.tomcat.catalina.ha
org.apache.tomcat.coyote
org.apache.tomcat.dbcp
org.apache.tomcat.jasper
org.apache.tomcat.jasper.el
org.apache.tomcat.jni
org.apache.tomcat.juli
org.apache.tomcat.ssi
org.apache.tomcat.storeconfig
org.apache.tomcat.tribes
org.apache.tomcat.util
org.apache.tomcat.util.scan
org.apache.tomcat.websocket

For the spec API I've used the official names pulled from each spec project:

jakarta.annotation
jakarta.el.api
jakarta.security.enterprise
jakarta.servlet
jakarta.servlet.jsp
jakarta.websocket.api

Does that look correct?

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