You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by ss...@apache.org on 2024/03/05 14:35:34 UTC
(xmlgraphics-fop) branch main updated: FOP-3160: Rename tools to avoid conflicts with core module
This is an automated email from the ASF dual-hosted git repository.
ssteiner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/xmlgraphics-fop.git
The following commit(s) were added to refs/heads/main by this push:
new de9d1b17e FOP-3160: Rename tools to avoid conflicts with core module
de9d1b17e is described below
commit de9d1b17e9cb89fb6f239e591d3092d98a251a2f
Author: Simon Steiner <ss...@apache.org>
AuthorDate: Tue Mar 5 14:31:47 2024 +0000
FOP-3160: Rename tools to avoid conflicts with core module
---
fop-core/pom.xml | 2 +-
fop-events/pom.xml | 2 +-
.../org/apache/fop/{tools => eventtools}/EventConventionException.java | 2 +-
.../org/apache/fop/{tools => eventtools}/EventProducerCollector.java | 2 +-
.../apache/fop/{tools => eventtools}/EventProducerCollectorTask.java | 2 +-
fop/build.xml | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/fop-core/pom.xml b/fop-core/pom.xml
index a041e727d..19a6fa90d 100644
--- 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
index 15e4e9947..1eeea6db0 100644
--- 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/fop-events/src/main/java/org/apache/fop/tools/EventConventionException.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventConventionException.java
similarity index 97%
rename from fop-events/src/main/java/org/apache/fop/tools/EventConventionException.java
rename to fop-events/src/main/java/org/apache/fop/eventtools/EventConventionException.java
index 363850b95..63aceb21d 100644
--- a/fop-events/src/main/java/org/apache/fop/tools/EventConventionException.java
+++ b/fop-events/src/main/java/org/apache/fop/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/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
similarity index 99%
rename from fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
rename to fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollector.java
index 2351fc870..fc72ffc47 100644
--- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollector.java
+++ b/fop-events/src/main/java/org/apache/fop/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-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java b/fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollectorTask.java
similarity index 99%
rename from fop-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java
rename to fop-events/src/main/java/org/apache/fop/eventtools/EventProducerCollectorTask.java
index 8796280fd..5dc64750e 100644
--- a/fop-events/src/main/java/org/apache/fop/tools/EventProducerCollectorTask.java
+++ b/fop-events/src/main/java/org/apache/fop/eventtools/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
index 781128dd8..45a45af63 100644
--- 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}"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org