Move patch files and transformer config into `transform` module
diff --git a/pom.xml b/pom.xml
index 2505619..5f67911 100644
--- a/pom.xml
+++ b/pom.xml
@@ -131,6 +131,7 @@
<modules>
<module>boms</module>
<module>tomee</module>
+ <module>transform</module>
</modules>
<dependencyManagement>
diff --git a/src/main/assembly/tomee-microprofile.xml b/src/main/assembly/tomee-microprofile.xml
deleted file mode 100644
index 6a1e49b..0000000
--- a/src/main/assembly/tomee-microprofile.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/src/main/assembly/tomee-plume.xml b/src/main/assembly/tomee-plume.xml
deleted file mode 100644
index 4a181db..0000000
--- a/src/main/assembly/tomee-plume.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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>
- <excludes>
- <!--exclude>%regex[lib/jakarta.faces-.*.jar]</exclude>-->
- <exclude>%regex[lib/eclipselink-.*.jar]</exclude>
- </excludes>
- </fileSet>
- </fileSets>
- <dependencySets>
- <dependencySet>
- <outputDirectory>/apache-tomee-plume-${project.version}/lib</outputDirectory>
- <scope>runtime</scope>
- <useTransitiveDependencies>true</useTransitiveDependencies>
- <useTransitiveFiltering>true</useTransitiveFiltering>
- </dependencySet>
- </dependencySets>
-</assembly>
-
diff --git a/src/main/assembly/tomee-plus.xml b/src/main/assembly/tomee-plus.xml
deleted file mode 100644
index e0c5708..0000000
--- a/src/main/assembly/tomee-plus.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/src/main/assembly/tomee-webprofile.xml b/src/main/assembly/tomee-webprofile.xml
deleted file mode 100644
index 1777653..0000000
--- a/src/main/assembly/tomee-webprofile.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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/tomee-microprofile-webapp/pom.xml b/tomee/tomee-microprofile-webapp/pom.xml
index 144f55c..f3b6439 100644
--- a/tomee/tomee-microprofile-webapp/pom.xml
+++ b/tomee/tomee-microprofile-webapp/pom.xml
@@ -207,8 +207,15 @@
</executions>
<configuration>
<overwrite>true</overwrite>
-<!-- <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>-->
+ <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>transform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.tomee.patch</groupId>
@@ -217,7 +224,7 @@
<configuration>
<select>tomee-microprofile-webapp-transformed-.*\.war</select>
<patchSources>
- <source>${project.basedir}/../../src/patch/java/</source>
+ <source>${project.basedir}/../../transform/src/patch/java/</source>
</patchSources>
<replacements>
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
diff --git a/tomee/tomee-plume-webapp/pom.xml b/tomee/tomee-plume-webapp/pom.xml
index b811a96..665618c 100644
--- a/tomee/tomee-plume-webapp/pom.xml
+++ b/tomee/tomee-plume-webapp/pom.xml
@@ -266,8 +266,15 @@
</executions>
<configuration>
<overwrite>true</overwrite>
-<!-- <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>-->
+ <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>transform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.tomee.patch</groupId>
@@ -276,7 +283,7 @@
<configuration>
<select>tomee-plume-webapp-transformed-.*\.war</select>
<patchSources>
- <source>${project.basedir}/../../src/patch/java/</source>
+ <source>${project.basedir}/../../transform/src/patch/java/</source>
<source>${project.basedir}/src/patch/java/</source>
</patchSources>
<replacements>
diff --git a/tomee/tomee-plus-webapp/pom.xml b/tomee/tomee-plus-webapp/pom.xml
index ce160e1..47aee6f 100644
--- a/tomee/tomee-plus-webapp/pom.xml
+++ b/tomee/tomee-plus-webapp/pom.xml
@@ -250,8 +250,15 @@
</executions>
<configuration>
<overwrite>true</overwrite>
-<!-- <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>-->
+ <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>transform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.tomee.patch</groupId>
@@ -260,7 +267,7 @@
<configuration>
<select>tomee-plus-webapp-transformed-.*\.war</select>
<patchSources>
- <source>${project.basedir}/../../src/patch/java/</source>
+ <source>${project.basedir}/../../transform/src/patch/java/</source>
</patchSources>
<replacements>
<openejb-version.properties>${project.build.outputDirectory}/openejb-version.properties</openejb-version.properties>
diff --git a/tomee/tomee-webprofile-webapp/pom.xml b/tomee/tomee-webprofile-webapp/pom.xml
index 113cf4c..bf978d6 100644
--- a/tomee/tomee-webprofile-webapp/pom.xml
+++ b/tomee/tomee-webprofile-webapp/pom.xml
@@ -158,8 +158,15 @@
</executions>
<configuration>
<overwrite>true</overwrite>
-<!-- <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>-->
+ <rulesDirectUri>/org/tomitribe/transformer/jakarta/jakarta-direct.properties</rulesDirectUri>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>transform</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
</plugin>
<plugin>
<groupId>org.apache.tomee.patch</groupId>
@@ -168,7 +175,7 @@
<configuration>
<select>tomee-webprofile-webapp-transformed-.*\.war</select>
<patchSources>
- <source>${project.basedir}/../../src/patch/java/</source>
+ <source>${project.basedir}/../../transform/src/patch/java/</source>
</patchSources>
<sourceExcludes>
<exclude>org/apache/cxf</exclude>
diff --git a/transform/pom.xml b/transform/pom.xml
new file mode 100644
index 0000000..5f7ebaf
--- /dev/null
+++ b/transform/pom.xml
@@ -0,0 +1,37 @@
+<?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$ $Date$ -->
+
+<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">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.tomee</groupId>
+ <artifactId>tomee-project</artifactId>
+ <version>9.0.0-M7-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>transform</artifactId>
+ <packaging>jar</packaging>
+ <name>TomEE :: Transform</name>
+ <description>Patches for TomEE Patch Plugin and Rules associated with the Eclipse Transformer</description>
+
+</project>
+
diff --git a/src/main/resources/org/tomitribe/transformer/jakarta/jakarta-direct.properties b/transform/src/main/resources/org/tomitribe/transformer/jakarta/jakarta-direct.properties
similarity index 100%
rename from src/main/resources/org/tomitribe/transformer/jakarta/jakarta-direct.properties
rename to transform/src/main/resources/org/tomitribe/transformer/jakarta/jakarta-direct.properties
diff --git a/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java b/transform/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
similarity index 100%
rename from src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
rename to transform/src/patch/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
diff --git a/src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java b/transform/src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
similarity index 100%
rename from src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
rename to transform/src/patch/java/org/apache/openjpa/enhance/PCClassFileTransformer.java
diff --git a/src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java b/transform/src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
similarity index 100%
rename from src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
rename to transform/src/patch/java/org/apache/openjpa/lib/meta/ClassMetaDataIterator.java
diff --git a/src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java b/transform/src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
similarity index 100%
rename from src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
rename to transform/src/patch/java/org/apache/openjpa/lib/util/TemporaryClassLoader.java
diff --git a/src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java b/transform/src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
similarity index 100%
rename from src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
rename to transform/src/patch/java/org/apache/openjpa/meta/AbstractMetaDataDefaults.java
diff --git a/src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java b/transform/src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java
similarity index 100%
rename from src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java
rename to transform/src/patch/java/org/quartz/core/QuartzSchedulerMBeanImpl.java
