You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jg...@apache.org on 2020/06/18 22:32:32 UTC
[tomee] 01/03: Add Jakarta EE 9 module. This copies the TomEE 8
zips, adds them with a new version,
and runs the transformation plugins on them
This is an automated email from the ASF dual-hosted git repository.
jgallimore pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit 640d6d5e26c5a963ee04d3f35b0a25cd2faf0c77
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Jun 18 23:03:43 2020 +0100
Add Jakarta EE 9 module. This copies the TomEE 8 zips, adds them with a new version, and runs the transformation plugins on them
---
jakartaee9/pom.xml | 336 +++++++++++++++++++++
.../src/main/assembly/tomee-microprofile.xml | 38 +++
jakartaee9/src/main/assembly/tomee-plume.xml | 38 +++
jakartaee9/src/main/assembly/tomee-plus.xml | 38 +++
jakartaee9/src/main/assembly/tomee-webprofile.xml | 38 +++
.../catalina/loader/WebappClassLoaderBase.java | 0
.../apache/cxf/jaxb/JAXBContextInitializer.java | 0
.../openjpa/enhance/PCClassFileTransformer.java | 0
.../openjpa/lib/meta/ClassMetaDataIterator.java | 0
.../openjpa/lib/util/TemporaryClassLoader.java | 0
.../openjpa/meta/AbstractMetaDataDefaults.java | 0
.../MbeansDescriptorsIntrospectionSource.java | 0
.../webbeans/proxy/AbstractProxyFactory.java | 0
.../jpa/deployment/JavaSECMPInitializer.java | 0
.../accessors/objects/MetadataAsmFactory.java | 0
.../metadata/accessors/objects/MetadataClass.java | 0
.../eclipse/persistence/jaxb/javamodel/Helper.java | 0
.../jaxb/javamodel/reflection/JavaClassImpl.java | 0
.../persistence/jaxb/rs/MOXyJsonProvider.java | 0
.../persistence/jpa/rs/PersistenceFactoryBase.java | 0
.../org/quartz/core/QuartzSchedulerMBeanImpl.java | 0
pom.xml | 1 +
tomee/apache-tomee/pom.xml | 32 --
tomee/apache-tomee/transformer/renames.properties | 209 -------------
transformer/run_transformer.sh | 24 --
25 files changed, 489 insertions(+), 265 deletions(-)
diff --git a/jakartaee9/pom.xml b/jakartaee9/pom.xml
new file mode 100644
index 0000000..6b66458
--- /dev/null
+++ b/jakartaee9/pom.xml
@@ -0,0 +1,336 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
+<!-- $Rev: 600338 $ $Date: 2007-12-02 09:08:04 -0800 (Sun, 02 Dec 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <artifactId>tomee-project</artifactId>
+ <groupId>org.apache.tomee</groupId>
+ <version>8.0.3-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>apache-tomee</artifactId>
+ <version>9.0.0-M1-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>TomEE :: TomEE :: Apache TomEE 9</name>
+
+ <properties>
+ <tomee.version>8.0.3-SNAPSHOT</tomee.version>
+ <tomee.build.name>${project.groupId}.tomee.tomee</tomee.build.name>
+ <webprofile.work-dir>${project.build.directory}/webprofile-work-dir</webprofile.work-dir>
+ <plus.work-dir>${project.build.directory}/plus-work-dir</plus.work-dir>
+ <plume.work-dir>${project.build.directory}/plume-work-dir</plume.work-dir>
+ <microprofile.work-dir>${project.build.directory}/microprofile-work-dir</microprofile.work-dir>
+ </properties>
+
+ <dependencies>
+ <dependency> <!-- to be sure to have it -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>webprofile</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency> <!-- to be sure to have it -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>microprofile</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency> <!-- to be sure to have it -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>plume</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency> <!-- to be sure to have it -->
+ <groupId>${project.groupId}</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>plus</classifier>
+ <type>zip</type>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>*</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>false</filtering>
+ </resource>
+ </resources>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack-webprofile</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>webprofile</classifier>
+ <type>zip</type>
+ <outputDirectory>${webprofile.work-dir}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-microprofile</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>microprofile</classifier>
+ <type>zip</type>
+ <outputDirectory>${microprofile.work-dir}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-plume</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>plume</classifier>
+ <type>zip</type>
+ <outputDirectory>${plume.work-dir}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ <execution>
+ <id>unpack-plus</id>
+ <phase>process-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>apache-tomee</artifactId>
+ <version>${tomee.version}</version>
+ <classifier>plus</classifier>
+ <type>zip</type>
+ <outputDirectory>${plus.work-dir}</outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>webprofile</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/tomee-webprofile.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>apache-tomee-webprofile-${project.version}</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>plus</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/tomee-plus.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>apache-tomee-plus-${project.version}</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>plume</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/tomee-plume.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>apache-tomee-plume-${project.version}</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>microprofile</id>
+ <phase>package</phase>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/tomee-microprofile.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ <appendAssemblyId>false</appendAssemblyId>
+ <finalName>apache-tomee-microprofile-${project.version}</finalName>
+ </configuration>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>${project.build.directory}/apache-tomee-webprofile-${project.version}.zip</file>
+ <type>zip</type>
+ <classifier>webprofile</classifier>
+ </artifact>
+ <artifact>
+ <file>${project.build.directory}/apache-tomee-plus-${project.version}.zip</file>
+ <type>zip</type>
+ <classifier>plus</classifier>
+ </artifact>
+ <artifact>
+ <file>${project.build.directory}/apache-tomee-plume-${project.version}.zip</file>
+ <type>zip</type>
+ <classifier>plume</classifier>
+ </artifact>
+ <artifact>
+ <file>${project.build.directory}/apache-tomee-microprofile-${project.version}.zip</file>
+ <type>zip</type>
+ <classifier>microprofile</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.tomitribe.transformer</groupId>
+ <artifactId>org.eclipse.transformer.maven</artifactId>
+ <version>0.1.1aa</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.tomee.patch</groupId>
+ <artifactId>tomee-patch-plugin</artifactId>
+ <version>0.1-SNAPSHOT</version>
+ <configuration>
+ <select>apache-tomee.*\.zip</select>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
diff --git a/jakartaee9/src/main/assembly/tomee-microprofile.xml b/jakartaee9/src/main/assembly/tomee-microprofile.xml
new file mode 100644
index 0000000..6a1e49b
--- /dev/null
+++ b/jakartaee9/src/main/assembly/tomee-microprofile.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+
+<!-- $Rev: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>tomee-microprofile</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${microprofile.work-dir}/apache-tomee-microprofile-${tomee.version}</directory>
+ <outputDirectory>/apache-tomee-microprofile-${project.version}</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+
diff --git a/jakartaee9/src/main/assembly/tomee-plume.xml b/jakartaee9/src/main/assembly/tomee-plume.xml
new file mode 100644
index 0000000..bb71e05
--- /dev/null
+++ b/jakartaee9/src/main/assembly/tomee-plume.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+
+<!-- $Rev: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>tomee-plume</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${plume.work-dir}/apache-tomee-plume-${tomee.version}</directory>
+ <outputDirectory>/apache-tomee-plume-${project.version}</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+
diff --git a/jakartaee9/src/main/assembly/tomee-plus.xml b/jakartaee9/src/main/assembly/tomee-plus.xml
new file mode 100644
index 0000000..e0c5708
--- /dev/null
+++ b/jakartaee9/src/main/assembly/tomee-plus.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+
+<!-- $Rev: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>tomee-plus</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${plus.work-dir}/apache-tomee-plus-${tomee.version}</directory>
+ <outputDirectory>/apache-tomee-plus-${project.version}</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+
diff --git a/jakartaee9/src/main/assembly/tomee-webprofile.xml b/jakartaee9/src/main/assembly/tomee-webprofile.xml
new file mode 100644
index 0000000..1777653
--- /dev/null
+++ b/jakartaee9/src/main/assembly/tomee-webprofile.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ 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.
+-->
+
+<!-- $Rev: 576067 $ $Date: 2007-09-16 03:17:08 -0700 (Sun, 16 Sep 2007) $ -->
+
+<assembly>
+ <id>tomee-webprofile</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <fileSets>
+ <fileSet>
+ <directory>${webprofile.work-dir}/apache-tomee-webprofile-${tomee.version}</directory>
+ <outputDirectory>/apache-tomee-webprofile-${project.version}</outputDirectory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
+
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/catalina/loader/WebappClassLoaderBase.java b/jakartaee9/src/patch/java/org/apache/catalina/loader/WebappClassLoaderBase.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/catalina/loader/WebappClassLoaderBase.java
rename to jakartaee9/src/patch/java/org/apache/catalina/loader/WebappClassLoaderBase.java
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/jakartaee9/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
rename to jakartaee9/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java b/jakartaee9/src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
rename to jakartaee9/src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java b/jakartaee9/src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
rename to jakartaee9/src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java b/jakartaee9/src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
rename to jakartaee9/src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java b/jakartaee9/src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
rename to jakartaee9/src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java b/jakartaee9/src/patch/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
rename to jakartaee9/src/patch/java/org/apache/tomcat/util/modeler/modules/MbeansDescriptorsIntrospectionSource.java
diff --git a/tomee/apache-tomee/src/patch/java/org/apache/webbeans/proxy/AbstractProxyFactory.java b/jakartaee9/src/patch/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
rename to jakartaee9/src/patch/java/org/apache/webbeans/proxy/AbstractProxyFactory.java
diff --git a/tomee/apache-tomee/src/patch/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java b/jakartaee9/src/patch/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
rename to jakartaee9/src/patch/java/org/eclipse/persistence/internal/jpa/deployment/JavaSECMPInitializer.java
diff --git a/tomee/apache-tomee/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java b/jakartaee9/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
rename to jakartaee9/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataAsmFactory.java
diff --git a/tomee/apache-tomee/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java b/jakartaee9/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
rename to jakartaee9/src/patch/java/org/eclipse/persistence/internal/jpa/metadata/accessors/objects/MetadataClass.java
diff --git a/tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jaxb/javamodel/Helper.java b/jakartaee9/src/patch/java/org/eclipse/persistence/jaxb/javamodel/Helper.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jaxb/javamodel/Helper.java
rename to jakartaee9/src/patch/java/org/eclipse/persistence/jaxb/javamodel/Helper.java
diff --git a/tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jaxb/javamodel/reflection/JavaClassImpl.java b/jakartaee9/src/patch/java/org/eclipse/persistence/jaxb/javamodel/reflection/JavaClassImpl.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jaxb/javamodel/reflection/JavaClassImpl.java
rename to jakartaee9/src/patch/java/org/eclipse/persistence/jaxb/javamodel/reflection/JavaClassImpl.java
diff --git a/tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jaxb/rs/MOXyJsonProvider.java b/jakartaee9/src/patch/java/org/eclipse/persistence/jaxb/rs/MOXyJsonProvider.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jaxb/rs/MOXyJsonProvider.java
rename to jakartaee9/src/patch/java/org/eclipse/persistence/jaxb/rs/MOXyJsonProvider.java
diff --git a/tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java b/jakartaee9/src/patch/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java
rename to jakartaee9/src/patch/java/org/eclipse/persistence/jpa/rs/PersistenceFactoryBase.java
diff --git a/tomee/apache-tomee/src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java b/jakartaee9/src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java
similarity index 100%
rename from tomee/apache-tomee/src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java
rename to jakartaee9/src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java
diff --git a/pom.xml b/pom.xml
index 32f2051..7943e44 100644
--- a/pom.xml
+++ b/pom.xml
@@ -592,6 +592,7 @@
<module>arquillian</module>
<module>utils</module>
<module>tomee</module>
+ <module>jakartaee9</module>
</modules>
<repositories>
<repository>
diff --git a/tomee/apache-tomee/pom.xml b/tomee/apache-tomee/pom.xml
index 6efa1f0..c48458d 100644
--- a/tomee/apache-tomee/pom.xml
+++ b/tomee/apache-tomee/pom.xml
@@ -506,38 +506,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.tomitribe.transformer</groupId>
- <artifactId>org.eclipse.transformer.maven</artifactId>
- <version>0.1.1</version>
- <configuration>
- <classifier>jakartaee9</classifier>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.tomee.patch</groupId>
- <artifactId>tomee-patch-plugin</artifactId>
- <version>0.1-SNAPSHOT</version>
- <configuration>
- <select>.*jakartaee.*\.zip</select>
- </configuration>
- <executions>
- <execution>
- <goals>
- <goal>run</goal>
- </goals>
- <phase>package</phase>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
diff --git a/tomee/apache-tomee/transformer/renames.properties b/tomee/apache-tomee/transformer/renames.properties
deleted file mode 100644
index cbf5119..0000000
--- a/tomee/apache-tomee/transformer/renames.properties
+++ /dev/null
@@ -1,209 +0,0 @@
-# Default jakarta configuration for package renames.
-#
-# Last update: 29-Apr-2020 TFB
-#
-# Format:
-# currentPackageName=newPackageName
-#
-# The current package name may contain a ".*" suffix. The suffix indicates
-# that sub-packages are to be matched. For example:
-#
-# javax.servlet.*=jakartax.servlet
-#
-# This will cause sub-packages like javax.servlet.annotation
-# to be replaced with jakartax.servlet.annotation
-#
-# By default, sub-packages are not updated.
-#
-# Package renames apply in several ways:
-# Class references in .class files are updated.
-# Qualified class names which appear in java string constants in .class files are updated.
-# Qualified resource references which appear in java string constants in .class files are updated.
-# Package references in manifest (MANIFEST.MF) and feature manifest (featureName.mf) files are updated.
-
-javax.activation=jakarta.activation
-javax.annotation=jakarta.annotation
-javax.annotation.concurrent=jakarta.annotation.concurrent
-javax.annotation.security=jakarta.annotation.security
-javax.annotation.sql=jakarta.annotation.sql
-javax.batch=jakarta.batch
-javax.batch.api=jakarta.batch.api
-javax.batch.api.chunk=jakarta.batch.api.chunk
-javax.batch.api.chunk.listener=jakarta.batch.api.chunk.listener
-javax.batch.api.listener=jakarta.batch.api.listener
-javax.batch.api.partition=jakarta.batch.api.partition
-javax.batch.operations=jakarta.batch.operations
-javax.batch.runtime=jakarta.batch.runtime
-javax.batch.runtime.context=jakarta.batch.runtime.context
-javax.cache=jakarta.cache
-javax.cache.annotation=jakarta.cache.annotation
-javax.cache.configuration=jakarta.cache.configuration
-javax.cache.event=jakarta.cache.event
-javax.cache.expiry=jakarta.cache.expiry
-javax.cache.integration=jakarta.cache.integration
-javax.cache.management=jakarta.cache.management
-javax.cache.processor=jakarta.cache.processor
-javax.cache.spi=jakarta.cache.spi
-javax.decorator=jakarta.decorator
-javax.ejb=jakarta.ejb
-javax.ejb.embeddable=jakarta.ejb.embeddable
-javax.ejb.spi=jakarta.ejb.spi
-javax.el=jakarta.el
-javax.enterprise=jakarta.enterprise
-javax.enterprise.concurrent=jakarta.enterprise.concurrent
-javax.enterprise.context=jakarta.enterprise.context
-javax.enterprise.context.control=jakarta.enterprise.context.control
-javax.enterprise.context.spi=jakarta.enterprise.context.spi
-javax.enterprise.deploy=jakarta.enterprise.deploy
-javax.enterprise.deploy.model=jakarta.enterprise.deploy.model
-javax.enterprise.deploy.model.exceptions=jakarta.enterprise.deploy.model.exceptions
-javax.enterprise.deploy.shared=jakarta.enterprise.deploy.shared
-javax.enterprise.deploy.shared.factories=jakarta.enterprise.deploy.shared.factories
-javax.enterprise.deploy.spi=jakarta.enterprise.deploy.spi
-javax.enterprise.deploy.spi.exceptions=jakarta.enterprise.deploy.spi.exceptions
-javax.enterprise.deploy.spi.factories=jakarta.enterprise.deploy.spi.factories
-javax.enterprise.deploy.spi.status=jakarta.enterprise.deploy.spi.status
-javax.enterprise.event=jakarta.enterprise.event
-javax.enterprise.inject=jakarta.enterprise.inject
-javax.enterprise.inject.literal=jakarta.enterprise.inject.literal
-javax.enterprise.inject.se=jakarta.enterprise.inject.se
-javax.enterprise.inject.spi=jakarta.enterprise.inject.spi
-javax.enterprise.inject.spi.configurator=jakarta.enterprise.inject.spi.configurator
-javax.enterprise.util=jakarta.enterprise.util
-javax.faces=jakarta.faces
-javax.faces.annotation=jakarta.faces.annotation
-javax.faces.application=jakarta.faces.application
-javax.faces.bean=jakarta.faces.bean
-javax.faces.component=jakarta.faces.component
-javax.faces.component.behavior=jakarta.faces.component.behavior
-javax.faces.component.html=jakarta.faces.component.html
-javax.faces.component.search=jakarta.faces.component.search
-javax.faces.component.visit=jakarta.faces.component.visit
-javax.faces.context=jakarta.faces.context
-javax.faces.convert=jakarta.faces.convert
-javax.faces.el=jakarta.faces.el
-javax.faces.event=jakarta.faces.event
-javax.faces.flow=jakarta.faces.flow
-javax.faces.flow.builder=jakarta.faces.flow.builder
-javax.faces.lifecycle=jakarta.faces.lifecycle
-javax.faces.model=jakarta.faces.model
-javax.faces.push=jakarta.faces.push
-javax.faces.render=jakarta.faces.render
-javax.faces.validator=jakarta.faces.validator
-javax.faces.view=jakarta.faces.view
-javax.faces.view.facelets=jakarta.faces.view.facelets
-javax.faces.webapp=jakarta.faces.webapp
-javax.inject=jakarta.inject
-javax.interceptor=jakarta.interceptor
-javax.jms=jakarta.jms
-javax.json=jakarta.json
-javax.json.bind=jakarta.json.bind
-javax.json.bind.adapter=jakarta.json.bind.adapter
-javax.json.bind.annotation=jakarta.json.bind.annotation
-javax.json.bind.config=jakarta.json.bind.config
-javax.json.bind.serializer=jakarta.json.bind.serializer
-javax.json.bind.spi=jakarta.json.bind.spi
-javax.json.spi=jakarta.json.spi
-javax.json.stream=jakarta.json.stream
-javax.jws=jakarta.jws
-javax.jws.soap=jakarta.jws.soap
-javax.mail=jakarta.mail
-javax.mail.event=jakarta.mail.event
-javax.mail.internet=jakarta.mail.internet
-javax.mail.search=jakarta.mail.search
-javax.mail.util=jakarta.mail.util
-javax.management=jakarta.management
-javax.management.j2ee=jakarta.management.j2ee
-javax.management.j2ee.statistics=jakarta.management.j2ee.statistics
-javax.persistence=jakarta.persistence
-javax.persistence.criteria=jakarta.persistence.criteria
-javax.persistence.metamodel=jakarta.persistence.metamodel
-javax.persistence.spi=jakarta.persistence.spi
-javax.resource=jakarta.resource
-javax.resource.cci=jakarta.resource.cci
-javax.resource.spi=jakarta.resource.spi
-javax.resource.spi.endpoint=jakarta.resource.spi.endpoint
-javax.resource.spi.security=jakarta.resource.spi.security
-javax.resource.spi.work=jakarta.resource.spi.work
-javax.security=jakarta.security
-javax.security.auth=jakarta.security.auth
-javax.security.auth.message=jakarta.security.auth.message
-javax.security.auth.message.callback=jakarta.security.auth.message.callback
-javax.security.auth.message.config=jakarta.security.auth.message.config
-javax.security.auth.message.module=jakarta.security.auth.message.module
-javax.security.enterprise=jakarta.security.enterprise
-javax.security.enterprise.authentication=jakarta.security.enterprise.authentication
-javax.security.enterprise.authentication.mechanism=jakarta.security.enterprise.authentication.mechanism
-javax.security.enterprise.authentication.mechanism.http=jakarta.security.enterprise.authentication.mechanism.http
-javax.security.enterprise.credential=jakarta.security.enterprise.credential
-javax.security.enterprise.identitystore=jakarta.security.enterprise.identitystore
-javax.security.jacc=jakarta.security.jacc
-javax.servlet=jakarta.servlet
-javax.servlet.annotation=jakarta.servlet.annotation
-javax.servlet.descriptor=jakarta.servlet.descriptor
-javax.servlet.http=jakarta.servlet.http
-javax.servlet.jsp=jakarta.servlet.jsp
-javax.servlet.jsp.el=jakarta.servlet.jsp.el
-javax.servlet.jsp.jstl=jakarta.servlet.jsp.jstl
-javax.servlet.jsp.jstl.core=jakarta.servlet.jsp.jstl.core
-javax.servlet.jsp.jstl.fmt=jakarta.servlet.jsp.jstl.fmt
-javax.servlet.jsp.jstl.sql=jakarta.servlet.jsp.jstl.sql
-javax.servlet.jsp.jstl.tlv=jakarta.servlet.jsp.jstl.tlv
-javax.servlet.jsp.resources=jakarta.servlet.jsp.resources
-javax.servlet.jsp.tagext=jakarta.servlet.jsp.tagext
-javax.servlet.resources=jakarta.servlet.resources
-javax.transaction=jakarta.transaction
-javax.validation=jakarta.validation
-javax.validation.bootstrap=jakarta.validation.bootstrap
-javax.validation.constraints=jakarta.validation.constraints
-javax.validation.constraintvalidation=jakarta.validation.constraintvalidation
-javax.validation.executable=jakarta.validation.executable
-javax.validation.groups=jakarta.validation.groups
-javax.validation.metadata=jakarta.validation.metadata
-javax.validation.spi=jakarta.validation.spi
-javax.validation.valueextraction=jakarta.validation.valueextraction
-javax.websocket=jakarta.websocket
-javax.websocket.server=jakarta.websocket.server
-javax.ws=jakarta.ws
-javax.wsdl=jakarta.wsdl
-javax.wsdl.extensions=jakarta.wsdl.extensions
-javax.wsdl.extensions.http=jakarta.wsdl.extensions.http
-javax.wsdl.extensions.mime=jakarta.wsdl.extensions.mime
-javax.wsdl.extensions.schema=jakarta.wsdl.extensions.schema
-javax.wsdl.extensions.soap=jakarta.wsdl.extensions.soap
-javax.wsdl.extensions.soap12=jakarta.wsdl.extensions.soap12
-javax.wsdl.factory=jakarta.wsdl.factory
-javax.wsdl.xml=jakarta.wsdl.xml
-javax.ws.rs=jakarta.ws.rs
-javax.ws.rs.client=jakarta.ws.rs.client
-javax.ws.rs.container=jakarta.ws.rs.container
-javax.ws.rs.core=jakarta.ws.rs.core
-javax.ws.rs.ext=jakarta.ws.rs.ext
-javax.ws.rs.sse=jakarta.ws.rs.sse
-javax.xml=jakarta.xml
-javax.xml.bind=jakarta.xml.bind
-javax.xml.bind.annotation=jakarta.xml.bind.annotation
-javax.xml.bind.annotation.adapters=jakarta.xml.bind.annotation.adapters
-javax.xml.bind.attachment=jakarta.xml.bind.attachment
-javax.xml.bind.helpers=jakarta.xml.bind.helpers
-javax.xml.bind.util=jakarta.xml.bind.util
-javax.xml.registry=jakarta.xml.registry
-javax.xml.registry.infomodel=jakarta.xml.registry.infomodel
-javax.xml.rpc=jakarta.xml.rpc
-javax.xml.rpc.encoding=jakarta.xml.rpc.encoding
-javax.xml.rpc.handler=jakarta.xml.rpc.handler
-javax.xml.rpc.handler.soap=jakarta.xml.rpc.handler.soap
-javax.xml.rpc.holders=jakarta.xml.rpc.holders
-javax.xml.rpc.server=jakarta.xml.rpc.server
-javax.xml.rpc.soap=jakarta.xml.rpc.soap
-javax.xml.soap=jakarta.xml.soap
-javax.xml.ws=jakarta.xml.ws
-javax.xml.ws.handler=jakarta.xml.ws.handler
-javax.xml.ws.handler.soap=jakarta.xml.ws.handler.soap
-javax.xml.ws.http=jakarta.xml.ws.http
-javax.xml.ws.soap=jakarta.xml.ws.soap
-javax.xml.ws.spi=jakarta.xml.ws.spi
-javax.xml.ws.spi.http=jakarta.xml.ws.spi.http
-javax.xml.ws.wsaddressing=jakarta.xml.ws.wsaddressing
-
-
diff --git a/transformer/run_transformer.sh b/transformer/run_transformer.sh
deleted file mode 100755
index cff5ad2..0000000
--- a/transformer/run_transformer.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
-CWD=$(pwd)
-
-cd "$DIR"
-
-if [ -d "jakartaee-prototype" ]; then
- rm -rf jakartaee-prototype
-fi
-
-if [ -d "transformer-0.1.0-SNAPSHOT" ]; then
- rm -rf transformer-0.1.0-SNAPSHOT
-fi
-
-git clone https://github.com/tbitonti/jakartaee-prototype.git
-cd jakartaee-prototype
-./gradlew assemble
-cd ..
-
-unzip jakartaee-prototype/transformer/build/distributions/transformer-0.1.0-SNAPSHOT.zip
-for f in ../tomee/apache-tomee/target/*.zip; do ./transformer-0.1.0-SNAPSHOT/bin/transformer "$f"; done
-
-cd "$CWD"