[tomcat-jakartaee-migration] branch master updated: Remove the Class-Path from manifest of shaded JAR

2021-02-15 Thread 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-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 07fa45b  Remove the Class-Path from manifest of shaded JAR
07fa45b is described below

commit 07fa45b68fc32698225d7f7a0d8d363a10ad7dc7
Author: remm 
AuthorDate: Mon Feb 15 15:00:01 2021 +0100

Remove the Class-Path from manifest of shaded JAR

Otherwise Tomcat's annotation scanning produces errors when scanning the
tools because it tries to parse the classpath entries (which are bogus
since all the needed classes are relocated and included).
---
 pom.xml | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/pom.xml b/pom.xml
index e791908..31e8978 100644
--- a/pom.xml
+++ b/pom.xml
@@ -283,6 +283,13 @@
   
org.apache.tomcat.jakartaee.bcel
 
   
+  
+
+  
+
+  
+
+  
 
   
 


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



Re: [tomcat-jakartaee-migration] branch master updated: Fix bug. Constant pool size is defined as u2

2021-02-15 Thread Rémy Maucherat
On Thu, Feb 11, 2021 at 3:47 PM Mark Thomas  wrote:

> On 11/02/2021 14:39, Rémy Maucherat wrote:
> > On Thu, Feb 11, 2021 at 12:08 PM Mark Thomas  wrote:
> >
> >> On 10/02/2021 17:27, Raymond Auge wrote:
> >>> missing requirement
> >>> [org.apache.servicemix.bundles.spring-beans [6](R 6.0)]
> >>> osgi.wiring.package; (osgi.wiring.package=jakarta.inject)]
> >>>
> >>> Is the jakarta.inject package exported by someone (in the framework)?
> >>>
> >>> I'm not sure how JIRA sets up it's OSGi runtime.
> >>
> >> Thanks. That was one of my working theories. It is helpful to have it
> >> confirmed.
> >>
> >> I have spent some more time on this today without success. As far as I
> >> can tell, I have converted every reference to javax.inject to jakarta
> >> .inject but I am obviously missing something but I can't figure out
> >> what. I think I am going to leave this for now.
> >>
> >> I'll start on the 0.2.0 release shortly and then plan to think some more
> >> about integration of this tool with Tomcat 10.
> >>
> >
> > +1 for the release.
> > If we're talking about its integration, I can help and/or do it.
>
> Thanks for the offer. I have the deployment approach about 95% complete
> ;). Maybe look at the runtime approach so we can compare?
>

Using the tool as a ClassFileTransformer works well (so this does not cover
classloader resources which need WebResource filtering, or static files),
except actually using the shaded JAR with Tomcat did not work and needed a
manifest tweak to drop its class-path.

Rémy


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


[tomcat-jakartaee-migration] branch master updated: Add constructor to specify the profile

2021-02-15 Thread 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-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
 new 46f3682  Add constructor to specify the profile
46f3682 is described below

commit 46f368234f854c3da57e479ef3918beb1657c9d2
Author: remm 
AuthorDate: Mon Feb 15 23:32:41 2021 +0100

Add constructor to specify the profile
---
 src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java 
b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
index 0173f71..bc36b28 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/ClassConverter.java
@@ -37,6 +37,14 @@ public class ClassConverter implements Converter, 
ClassFileTransformer {
 private static final Logger logger = 
Logger.getLogger(ClassConverter.class.getCanonicalName());
 private static final StringManager sm = 
StringManager.getManager(ClassConverter.class);
 
+protected final EESpecProfile profile;
+public ClassConverter() {
+this(EESpecProfile.TOMCAT);
+}
+public ClassConverter(EESpecProfile profile) {
+this.profile = profile;
+}
+
 @Override
 public boolean accepts(String filename) {
 String extension = Util.getExtension(filename);
@@ -88,7 +96,7 @@ public class ClassConverter implements Converter, 
ClassFileTransformer {
 ByteArrayInputStream inputStream = new 
ByteArrayInputStream(classfileBuffer);
 ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
 try {
-convert(className, inputStream, outputStream, 
EESpecProfile.TOMCAT);
+convert(className, inputStream, outputStream, profile);
 } catch (IOException e) {
 throw new IllegalClassFormatException(e.getLocalizedMessage());
 }


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



Any information about planed work for joint ASF-OGC-OSGeo code sprint?

2021-02-15 Thread Martin Desruisseaux

Hello

You may not be aware of this, but registrants at this week's Geospatial 
code sprint [1] are interested in learning more about Apache Tomcat. A 
virtual meeting room and an agenda (currently empty) have been created 
[2]. A short pitch will be presented Wednesday with the following content:


   Apache Tomcat is an open-source implementation of the Java Servlet,
   JavaServer Pages, Java Expression Language and WebSocket technologies.

   Planned work: (anything here?)

Is there anything to change in above description? Does anyone know what 
are the planed work? If anyone can provide those information, reply on 
geospat...@apache.org mailing list would be appreciated. If anyone can 
attend, even if only for answering questions that may be asked in the 
Tomcat virtual room, that would be of course welcome (registration is free).


I apologize for the short notice,

    Martin Desruisseaux

[1]https://www.ogc.org/ogcevents/2021-joint-asf-ogc-osgeo-code-sprint
[2] 
https://github.com/opengeospatial/joint-ogc-osgeo-asf-sprint-2021/blob/master/group/ApacheTomcat.adoc



Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 0.2.0

2021-02-15 Thread Martin Grigorov
On Thu, Feb 11, 2021 at 7:47 PM Mark Thomas  wrote:

> The proposed Apache Tomcat migration tool for Jakarta EE 0.2.0 is now
> available for voting.
>
> The significant changes since 0.1.0 are:
>
> - Various fixes to the packages that are and are not converted
>
> - A new option to process zip archives in memory to support zip files
>   that use options that are incompatible with a streaming approach
>
> - A new option to exclude files from transformation
>
> It can be obtained from:
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.2.0/
>
> The Maven staging repo is:
> https://repository.apache.org/content/repositories/orgapachetomcat-1299/
>
> The tag is:
> https://github.com/apache/tomcat-jakartaee-migration/tree/0.2.0
> 041e256e92078cd3b16a9adcd77faf257e3a5c88
>
> The proposed 0.2.0 release is:
>
> [ ] -1: Broken. Do not release because...
> [ X ] +1: Acceptable. Go ahead and release.
>

Built it from sources.
Migrated Apache Wicket 9.x examples application, with streaming.

Martin


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


Re: [VOTE] Apache Tomcat migration tool for Jakarta EE 0.2.0

2021-02-15 Thread Romain Manni-Bucau
+1 (non binding)

Romain Manni-Bucau
@rmannibucau  |  Blog
 | Old Blog
 | Github  |
LinkedIn  | Book



Le mar. 16 févr. 2021 à 08:43, Martin Grigorov  a
écrit :

> On Thu, Feb 11, 2021 at 7:47 PM Mark Thomas  wrote:
>
> > The proposed Apache Tomcat migration tool for Jakarta EE 0.2.0 is now
> > available for voting.
> >
> > The significant changes since 0.1.0 are:
> >
> > - Various fixes to the packages that are and are not converted
> >
> > - A new option to process zip archives in memory to support zip files
> >   that use options that are incompatible with a streaming approach
> >
> > - A new option to exclude files from transformation
> >
> > It can be obtained from:
> >
> https://dist.apache.org/repos/dist/dev/tomcat/jakartaee-migration/v0.2.0/
> >
> > The Maven staging repo is:
> > https://repository.apache.org/content/repositories/orgapachetomcat-1299/
> >
> > The tag is:
> > https://github.com/apache/tomcat-jakartaee-migration/tree/0.2.0
> > 041e256e92078cd3b16a9adcd77faf257e3a5c88
> >
> > The proposed 0.2.0 release is:
> >
> > [ ] -1: Broken. Do not release because...
> > [ X ] +1: Acceptable. Go ahead and release.
> >
>
> Built it from sources.
> Migrated Apache Wicket 9.x examples application, with streaming.
>
> Martin
>
>
> > Thanks,
> >
> > Mark
> >
> > -
> > To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> > For additional commands, e-mail: dev-h...@tomcat.apache.org
> >
> >
>