FOP-3160: Rename tools to avoid conflicts with core module

apache · Mar 5, 2024 · de9d1b1 · de9d1b1
1 parent 3133a01
commit de9d1b1
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/fop-core/pom.xml b/fop-core/pom.xml
@@ -283,7 +283,7 @@
             </goals>
             <configuration>
               <target>
-                <taskdef name="collectEvents" classname="org.apache.fop.tools.EventProducerCollectorTask" classpathref="maven.compile.classpath"/>
+                <taskdef name="collectEvents" classname="org.apache.fop.eventtools.EventProducerCollectorTask" classpathref="maven.compile.classpath"/>
                 <collectEvents destdir="${project.build.outputDirectory}">
                   <fileset dir="${project.basedir}/src/main/java">
                     <include name="**/accessibility/AccessibilityEventProducer.java"/>

diff --git a/fop-events/pom.xml b/fop-events/pom.xml
@@ -78,7 +78,7 @@
             </goals>
             <configuration>
               <target>
-                <taskdef name="collectEvents" classname="org.apache.fop.tools.EventProducerCollectorTask">
+                <taskdef name="collectEvents" classname="org.apache.fop.eventtools.EventProducerCollectorTask">
                   <classpath>
                     <path refid="maven.compile.classpath"/>
                     <path refid="maven.test.classpath"/>

diff --git a/...e/fop/tools/EventConventionException.java → .../eventtools/EventConventionException.java b/...e/fop/tools/EventConventionException.java → .../eventtools/EventConventionException.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.tools;
+package org.apache.fop.eventtools;
 
 /**
  * This exception is used to indicate a violation of the conventions for event producers.

diff --git a/...che/fop/tools/EventProducerCollector.java → ...op/eventtools/EventProducerCollector.java b/...che/fop/tools/EventProducerCollector.java → ...op/eventtools/EventProducerCollector.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.tools;
+package org.apache.fop.eventtools;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/...fop/tools/EventProducerCollectorTask.java → ...venttools/EventProducerCollectorTask.java b/...fop/tools/EventProducerCollectorTask.java → ...venttools/EventProducerCollectorTask.java
@@ -17,7 +17,7 @@
 
 /* $Id$ */
 
-package org.apache.fop.tools;
+package org.apache.fop.eventtools;
 
 import java.io.File;
 import java.io.FileNotFoundException;

diff --git a/fop/build.xml b/fop/build.xml
@@ -325,7 +325,7 @@ list of possible build targets.
         <include name="**/tools/*.xsl"/>
       </fileset>
     </copy>
-    <taskdef name="eventResourceGenerator" classname="org.apache.fop.tools.EventProducerCollectorTask">
+    <taskdef name="eventResourceGenerator" classname="org.apache.fop.eventtools.EventProducerCollectorTask">
       <classpath>
         <path refid="libs-tools-build-classpath"/>
         <pathelement location="${build.classes.dir}"/>